diff options
| author | dcaiafa@chromium.org <dcaiafa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 06:33:50 +0000 |
|---|---|---|
| committer | dcaiafa@chromium.org <dcaiafa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 06:35:01 +0000 |
| commit | 20013200c233df4c0720a9bab287001e36c3c2c1 (patch) | |
| tree | 29d381c1c4c464e3c230e983f024312b2adb8cd1 /remoting/host/fake_desktop_environment.h | |
| parent | d6907a5c07058d610578824939b08e1e78337370 (diff) | |
| download | chromium_src-20013200c233df4c0720a9bab287001e36c3c2c1.zip chromium_src-20013200c233df4c0720a9bab287001e36c3c2c1.tar.gz chromium_src-20013200c233df4c0720a9bab287001e36c3c2c1.tar.bz2 | |
Use webrtc::MouseCursorMonitor for cursor shapes
Use webrtc::MouseCursorMonitor for cursor shapes instead of
webrtc::VideoFrameCapturer, in preparation for deprecating cursor shape
functionality in the latter.
Fix memory corruption in VideoSchedulerTests_StartAndStop, where a lingering
capture task could trigger a expectation action declared on the stack during
tear down. My changes to the test somehow made the race condition more likely.
BUG=324033
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247689
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=248045
Review URL: https://codereview.chromium.org/92473002
Cr-Commit-Position: refs/heads/master@{#288226}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/fake_desktop_environment.h')
| -rw-r--r-- | remoting/host/fake_desktop_environment.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/host/fake_desktop_environment.h b/remoting/host/fake_desktop_environment.h index 412702d..5f6c93a 100644 --- a/remoting/host/fake_desktop_environment.h +++ b/remoting/host/fake_desktop_environment.h @@ -6,6 +6,7 @@ #define REMOTING_HOST_FAKE_DESKTOP_ENVIRONMENT_H_ #include "remoting/host/desktop_environment.h" +#include "remoting/host/fake_mouse_cursor_monitor.h" #include "remoting/host/fake_screen_capturer.h" #include "remoting/host/input_injector.h" #include "remoting/host/screen_controls.h" @@ -51,6 +52,8 @@ class FakeDesktopEnvironment : public DesktopEnvironment { virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE; virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE; virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE; + virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() + OVERRIDE; virtual std::string GetCapabilities() const OVERRIDE; virtual void SetCapabilities(const std::string& capabilities) OVERRIDE; virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler( |