| Index: webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
|
| diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
|
| index 7a72031c791f0583fc7e5ea9b7a073a50a356394..6d381c8352c71d091bd28c2d7e215d9c62b3feef 100644
|
| --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
|
| +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
|
| @@ -20,8 +20,8 @@ namespace webrtc {
|
| // A wrapper for DesktopCapturer that also captures mouse using specified
|
| // MouseCursorMonitor and renders it on the generated streams.
|
| class DesktopAndCursorComposer : public DesktopCapturer,
|
| - public DesktopCapturer::Callback,
|
| - public MouseCursorMonitor::Callback {
|
| + public DesktopCapturer::Callback,
|
| + public MouseCursorMonitor::Callback {
|
| public:
|
| // Creates a new blender that captures mouse cursor using |mouse_monitor| and
|
| // renders it into the frames generated by |desktop_capturer|. If
|
| @@ -33,12 +33,13 @@ class DesktopAndCursorComposer : public DesktopCapturer,
|
|
|
| // DesktopCapturer interface.
|
| void Start(DesktopCapturer::Callback* callback) override;
|
| + void SetSharedMemoryFactory(
|
| + rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory) override;
|
| void Capture(const DesktopRegion& region) override;
|
| void SetExcludedWindow(WindowId window) override;
|
|
|
| private:
|
| // DesktopCapturer::Callback interface.
|
| - SharedMemory* CreateSharedMemory(size_t size) override;
|
| void OnCaptureCompleted(DesktopFrame* frame) override;
|
|
|
| // MouseCursorMonitor::Callback interface.
|
|
|