Index: remoting/host/desktop_session_win.cc |
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc |
index ddba2ef8dabee168e799eae0a2f5f6b9d4827e80..008f7be86bc23e6266f0ba24b85ee3e038c16807 100644 |
--- a/remoting/host/desktop_session_win.cc |
+++ b/remoting/host/desktop_session_win.cc |
@@ -225,26 +225,22 @@ bool RdpSession::Initialize(const ScreenResolution& resolution) { |
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, |