14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
83 lines
1.9 KiB
C++
Executable File
83 lines
1.9 KiB
C++
Executable File
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/modules/desktop_capture/window_capturer.h"
|
|
|
|
#include <assert.h>
|
|
|
|
#include "webrtc/modules/desktop_capture/desktop_frame.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
class WindowCapturerNull : public WindowCapturer {
|
|
public:
|
|
WindowCapturerNull();
|
|
virtual ~WindowCapturerNull();
|
|
|
|
// WindowCapturer interface.
|
|
bool GetWindowList(WindowList* windows) override;
|
|
bool SelectWindow(WindowId id) override;
|
|
bool BringSelectedWindowToFront() override;
|
|
|
|
// DesktopCapturer interface.
|
|
void Start(Callback* callback) override;
|
|
void Capture(const DesktopRegion& region) override;
|
|
|
|
private:
|
|
Callback* callback_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(WindowCapturerNull);
|
|
};
|
|
|
|
WindowCapturerNull::WindowCapturerNull()
|
|
: callback_(NULL) {
|
|
}
|
|
|
|
WindowCapturerNull::~WindowCapturerNull() {
|
|
}
|
|
|
|
bool WindowCapturerNull::GetWindowList(WindowList* windows) {
|
|
// Not implemented yet.
|
|
return false;
|
|
}
|
|
|
|
bool WindowCapturerNull::SelectWindow(WindowId id) {
|
|
// Not implemented yet.
|
|
return false;
|
|
}
|
|
|
|
bool WindowCapturerNull::BringSelectedWindowToFront() {
|
|
// Not implemented yet.
|
|
return false;
|
|
}
|
|
|
|
void WindowCapturerNull::Start(Callback* callback) {
|
|
assert(!callback_);
|
|
assert(callback);
|
|
|
|
callback_ = callback;
|
|
}
|
|
|
|
void WindowCapturerNull::Capture(const DesktopRegion& region) {
|
|
// Not implemented yet.
|
|
callback_->OnCaptureCompleted(NULL);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
WindowCapturer* WindowCapturer::Create(const DesktopCaptureOptions& options) {
|
|
return new WindowCapturerNull();
|
|
}
|
|
|
|
} // namespace webrtc
|