Use webrtc::DesktopCapturer for screen capturer implementation.
Screen capturers are being moved from media/video/capture/screen to
third_party/webrtc. This CL is an intermediate step in that process.
Depends on https://webrtc-codereview.appspot.com/1322007/
[email protected] (third_party/webrtc dependency)
Review URL: https://chromiumcodereview.appspot.com/13983010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200504 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
index f263e82..36d7fb1 100644
--- a/remoting/host/desktop_session_win.cc
+++ b/remoting/host/desktop_session_win.cc
@@ -226,26 +226,22 @@
return false;
}
- // DaemonProcess::CreateDesktopSession() verifies that the resolution is
- // valid.
- DCHECK(resolution.IsValid());
-
ScreenResolution local_resolution = resolution;
// If the screen resolution is not specified, use the default screen
// resolution.
if (local_resolution.IsEmpty()) {
- local_resolution.dimensions_.set(kDefaultRdpScreenWidth,
- kDefaultRdpScreenHeight);
- local_resolution.dpi_.set(kDefaultRdpDpi, kDefaultRdpDpi);
+ local_resolution = ScreenResolution(
+ webrtc::DesktopSize(kDefaultRdpScreenWidth, kDefaultRdpScreenHeight),
+ webrtc::DesktopVector(kDefaultRdpDpi, kDefaultRdpDpi));
}
// Get the screen dimensions assuming the default DPI.
- SkISize host_size = local_resolution.ScaleDimensionsToDpi(
- SkIPoint::Make(kDefaultRdpDpi, kDefaultRdpDpi));
+ webrtc::DesktopSize host_size = local_resolution.ScaleDimensionsToDpi(
+ webrtc::DesktopVector(kDefaultRdpDpi, kDefaultRdpDpi));
// Make sure that the host resolution is within the limits supported by RDP.
- host_size = SkISize::Make(
+ host_size = webrtc::DesktopSize(
std::min(kMaxRdpScreenWidth,
std::max(kMinRdpScreenWidth, host_size.width())),
std::min(kMaxRdpScreenHeight,
