diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 02:39:02 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 02:39:02 +0000 |
| commit | cd8088054c70b7663d59eb94895fc170ea4537bc (patch) | |
| tree | 31f72ae325add2ea9bed569018224cb9b29f16f8 /remoting | |
| parent | 6777f634d9742cc4d8e3f4dc5a368f6d1d554ec3 (diff) | |
| download | chromium_src-cd8088054c70b7663d59eb94895fc170ea4537bc.zip chromium_src-cd8088054c70b7663d59eb94895fc170ea4537bc.tar.gz chromium_src-cd8088054c70b7663d59eb94895fc170ea4537bc.tar.bz2 | |
Don't use ScreenCapturer::CreateWithXDamage() in chrome and chromoting
ScreenCapturer::CreateWithXDamage() is broken in the last webrtc roll,
and it's being deprecated anyway.
R=lambroslambrou@chromium.org, wez@chromium.org
Review URL: https://codereview.chromium.org/27195008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/me2me_desktop_environment.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc index edc5b87..f9f9113 100644 --- a/remoting/host/me2me_desktop_environment.cc +++ b/remoting/host/me2me_desktop_environment.cc @@ -15,6 +15,7 @@ #include "remoting/host/local_input_monitor.h" #include "remoting/host/resizing_host_observer.h" #include "remoting/host/screen_controls.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" #if defined(OS_POSIX) @@ -40,13 +41,11 @@ scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { scoped_ptr<webrtc::ScreenCapturer> Me2MeDesktopEnvironment::CreateVideoCapturer() { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - -#if defined(OS_LINUX) + webrtc::DesktopCaptureOptions options = + webrtc::DesktopCaptureOptions::CreateDefault(); + options.set_use_update_notifications(true); return scoped_ptr<webrtc::ScreenCapturer>( - webrtc::ScreenCapturer::CreateWithXDamage(true)); -#else // !defined(OS_LINUX) - return scoped_ptr<webrtc::ScreenCapturer>(webrtc::ScreenCapturer::Create()); -#endif // !defined(OS_LINUX) + webrtc::ScreenCapturer::Create(options)); } std::string Me2MeDesktopEnvironment::GetCapabilities() const { |