| Index: webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
|
| diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
|
| index 74d25d4e1fac99e3d75e93bad0f17e4727a3263f..5da8beebb6e9936b086918355e6ee51345817814 100644
|
| --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
|
| +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
|
| @@ -136,6 +136,11 @@ void DesktopAndCursorComposer::Start(DesktopCapturer::Callback* callback) {
|
| desktop_capturer_->Start(this);
|
| }
|
|
|
| +void DesktopAndCursorComposer::SetSharedMemoryFactory(
|
| + rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory) {
|
| + desktop_capturer_->SetSharedMemoryFactory(std::move(shared_memory_factory));
|
| +}
|
| +
|
| void DesktopAndCursorComposer::Capture(const DesktopRegion& region) {
|
| if (mouse_monitor_.get())
|
| mouse_monitor_->Capture();
|
| @@ -146,10 +151,6 @@ void DesktopAndCursorComposer::SetExcludedWindow(WindowId window) {
|
| desktop_capturer_->SetExcludedWindow(window);
|
| }
|
|
|
| -SharedMemory* DesktopAndCursorComposer::CreateSharedMemory(size_t size) {
|
| - return callback_->CreateSharedMemory(size);
|
| -}
|
| -
|
| void DesktopAndCursorComposer::OnCaptureCompleted(DesktopFrame* frame) {
|
| if (frame && cursor_.get() && cursor_state_ == MouseCursorMonitor::INSIDE) {
|
| DesktopFrameWithCursor* frame_with_cursor =
|
|
|