Remove dependency on skia from remoting

remoting/host/win/rdp_client.cc

 // Copyright (c) 2013 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/win/rdp_client.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/win/registry.h"
 #include "net/base/ip_endpoint.h"
 #include "remoting/base/typed_buffer.h"
 #include "remoting/host/win/rdp_client_window.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace remoting {
 
 namespace {
 
 // 127.0.0.1 is explicitly blocked by the RDP ActiveX control, so we use
 // 127.0.0.2 instead.
 const unsigned char kRdpLoopbackAddress[] = { 127, 0, 0, 2 };
 
 const int kDefaultRdpPort = 3389;
@@ skipping 11 matching lines @@
 class RdpClient::Core
     : public base::RefCountedThreadSafe<Core>,
       public RdpClientWindow::EventHandler {
  public:
   Core(
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
       RdpClient::EventHandler* event_handler);
 
   // Initiates a loopback RDP connection.
-  void Connect(const SkISize& screen_size, const std::string& terminal_id);
+  void Connect(const webrtc::DesktopSize& screen_size,
+               const std::string& terminal_id);
 
   // Initiates a graceful shutdown of the RDP connection.
   void Disconnect();
 
   // Sends Secure Attention Sequence to the session.
   void InjectSas();
 
   // RdpClientWindow::EventHandler interface.
   virtual void OnConnected() OVERRIDE;
   virtual void OnDisconnected() OVERRIDE;
@@ skipping 22 matching lines @@
 
   // A self-reference to keep the object alive during connection shutdown.
   scoped_refptr<Core> self_;
 
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 RdpClient::RdpClient(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-    const SkISize& screen_size,
+    const webrtc::DesktopSize& screen_size,
     const std::string& terminal_id,
     EventHandler* event_handler) {
   DCHECK(caller_task_runner->BelongsToCurrentThread());
 
   core_ = new Core(caller_task_runner, ui_task_runner, event_handler);
   core_->Connect(screen_size, terminal_id);
 }
 
 RdpClient::~RdpClient() {
   DCHECK(CalledOnValidThread());
 
   core_->Disconnect();
 }
 
 void RdpClient::InjectSas() {
   DCHECK(CalledOnValidThread());
 
   core_->InjectSas();
 }
 
 RdpClient::Core::Core(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
     RdpClient::EventHandler* event_handler)
     : caller_task_runner_(caller_task_runner),
       ui_task_runner_(ui_task_runner),
       event_handler_(event_handler) {
 }
 
-void RdpClient::Core::Connect(const SkISize& screen_size,
+void RdpClient::Core::Connect(const webrtc::DesktopSize& screen_size,
                               const std::string& terminal_id) {
   if (!ui_task_runner_->BelongsToCurrentThread()) {
     ui_task_runner_->PostTask(
         FROM_HERE, base::Bind(&Core::Connect, this, screen_size, terminal_id));
     return;
   }
 
   DCHECK_EQ(base::MessageLoop::current()->type(), base::MessageLoop::TYPE_UI);
   DCHECK(!rdp_client_window_);
   DCHECK(!self_);
@@ skipping 91 matching lines @@
   }
 
   if (event_handler_) {
     RdpClient::EventHandler* event_handler = event_handler_;
     event_handler_ = NULL;
     event_handler->OnRdpClosed();
   }
 }
 
 }  // namespace remoting