Revert 224101 "Remove dependency on Skia from chromoting client."

trunk/src/remoting/client/rectangle_update_decoder.h

Index: trunk/src/remoting/client/rectangle_update_decoder.h
===================================================================
--- trunk/src/remoting/client/rectangle_update_decoder.h	(revision 224204)
+++ trunk/src/remoting/client/rectangle_update_decoder.h	(working copy)
@@ -15,7 +15,6 @@
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/frame_producer.h"
 #include "remoting/protocol/video_stub.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -53,12 +52,11 @@
   // FrameProducer implementation.  These methods may be called before we are
   // Initialize()d, or we know the source screen size.
   virtual void DrawBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
-  virtual void InvalidateRegion(const webrtc::DesktopRegion& region) OVERRIDE;
+  virtual void InvalidateRegion(const SkRegion& region) OVERRIDE;
   virtual void RequestReturnBuffers(const base::Closure& done) OVERRIDE;
-  virtual void SetOutputSizeAndClip(
-      const webrtc::DesktopSize& view_size,
-      const webrtc::DesktopRect& clip_area) OVERRIDE;
-  virtual const webrtc::DesktopRegion* GetBufferShape() OVERRIDE;
+  virtual void SetOutputSizeAndClip(const SkISize& view_size,
+                                    const SkIRect& clip_area) OVERRIDE;
+  virtual const SkRegion* GetBufferShape() OVERRIDE;
 
   // VideoStub implementation.
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
@@ -91,14 +89,14 @@
   scoped_ptr<VideoDecoder> decoder_;
 
   // Remote screen size in pixels.
-  webrtc::DesktopSize source_size_;
+  SkISize source_size_;
 
   // Vertical and horizontal DPI of the remote screen.
-  webrtc::DesktopVector source_dpi_;
+  SkIPoint source_dpi_;
 
   // The current dimensions of the frame consumer view.
-  webrtc::DesktopSize view_size_;
-  webrtc::DesktopRect clip_area_;
+  SkISize view_size_;
+  SkIRect clip_area_;
 
   // The drawing buffers supplied by the frame consumer.
   std::list<webrtc::DesktopFrame*> buffers_;