| Index: webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
|
| diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
|
| index d3035a15ca52d4c3f79aa2082c0dc4610e97f9ea..31c79cdda3cbc76e1802bebe6485eb7f46c06f5b 100644
|
| --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
|
| +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
|
| @@ -36,22 +36,6 @@ const UINT DWM_EC_ENABLECOMPOSITION = 1;
|
|
|
| const wchar_t kDwmapiLibraryName[] = L"dwmapi.dll";
|
|
|
| -// SharedMemoryFactory that creates SharedMemory using the deprecated
|
| -// DesktopCapturer::Callback::CreateSharedMemory().
|
| -class CallbackSharedMemoryFactory : public SharedMemoryFactory {
|
| - public:
|
| - CallbackSharedMemoryFactory(DesktopCapturer::Callback* callback)
|
| - : callback_(callback) {}
|
| - ~CallbackSharedMemoryFactory() override {}
|
| -
|
| - rtc::scoped_ptr<SharedMemory> CreateSharedMemory(size_t size) override {
|
| - return rtc::scoped_ptr<SharedMemory>(callback_->CreateSharedMemory(size));
|
| - }
|
| -
|
| - private:
|
| - DesktopCapturer::Callback* callback_;
|
| -};
|
| -
|
| } // namespace
|
|
|
| ScreenCapturerWinGdi::ScreenCapturerWinGdi(const DesktopCaptureOptions& options)
|
| @@ -172,8 +156,6 @@ void ScreenCapturerWinGdi::Start(Callback* callback) {
|
| assert(callback);
|
|
|
| callback_ = callback;
|
| - if (!shared_memory_factory_)
|
| - shared_memory_factory_.reset(new CallbackSharedMemoryFactory(callback));
|
|
|
| // Vote to disable Aero composited desktop effects while capturing. Windows
|
| // will restore Aero automatically if the process exits. This has no effect
|
|
|