Use webrtc::DesktopCapturer for screen capturer implementation.

remoting/host/client_session.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop_proxy.h"
 #include "media/video/capture/screen/screen_capturer.h"
@@ skipping 81 matching lines @@
   DCHECK(!screen_controls_);
   DCHECK(!video_scheduler_);
 
   connection_.reset();
 }
 
 void ClientSession::NotifyClientResolution(
     const protocol::ClientResolution& resolution) {
   DCHECK(CalledOnValidThread());
 
-  if (!resolution.has_dips_width() || !resolution.has_dips_height())
+  if (!resolution.has_dips_width() || !resolution.has_dips_height() ||
+      resolution.dips_width() < 0 || resolution.dips_height() < 0) {
     return;
+  }
 
   VLOG(1) << "Received ClientResolution (dips_width="
           << resolution.dips_width() << ", dips_height="
           << resolution.dips_height() << ")";
 
   if (!screen_controls_)
     return;
 
+
   ScreenResolution client_resolution(
-      SkISize::Make(resolution.dips_width(), resolution.dips_height()),
-      SkIPoint::Make(kDefaultDPI, kDefaultDPI));
+      webrtc::DesktopSize(resolution.dips_width(), resolution.dips_height()),
+      webrtc::DesktopVector(kDefaultDPI, kDefaultDPI));
 
   // Try to match the client's resolution.
-  if (client_resolution.IsValid())

[alexeypa (please no reviews), 2013/04/26 21:33:58]

IsValid() was more restrictive than the checks in this method. For instance it
tests for negative screen dimensions. I suspect various SetScreenResolution()
implementations could rely on this. If they weren't it is still better to check
it here because this is the common place were the resolution coming from the
wire is validated.

[Sergey Ulanov, 2013/05/07 22:25:50]

Added checks for screen dimentions. It's actually job of the protocol layer to
check validity of the incoming messages, it's wrong that we do it here - added
TODO to fix it.

-    screen_controls_->SetScreenResolution(client_resolution);
+  screen_controls_->SetScreenResolution(client_resolution);
 }
 
 void ClientSession::ControlVideo(const protocol::VideoControl& video_control) {
   DCHECK(CalledOnValidThread());
 
   if (video_control.has_enable()) {
     VLOG(1) << "Received VideoControl (enable="
             << video_control.enable() << ")";
     if (video_scheduler_)
       video_scheduler_->Pause(!video_control.enable());
@@ skipping 273 matching lines @@
     return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex());
   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
     return scoped_ptr<AudioEncoder>(new AudioEncoderOpus());
   }
 
   NOTIMPLEMENTED();
   return scoped_ptr<AudioEncoder>(NULL);
 }
 
 }  // namespace remoting