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

trunk/src/remoting/client/jni/jni_frame_consumer.h

Index: trunk/src/remoting/client/jni/jni_frame_consumer.h
===================================================================
--- trunk/src/remoting/client/jni/jni_frame_consumer.h	(revision 224204)
+++ trunk/src/remoting/client/jni/jni_frame_consumer.h	(working copy)
@@ -8,7 +8,6 @@
 #include "remoting/client/frame_consumer.h"
 
 #include "base/compiler_specific.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace webrtc {
 class DesktopFrame;
@@ -30,13 +29,13 @@
   void set_frame_producer(FrameProducer* producer);
 
   // FrameConsumer implementation.
-  virtual void ApplyBuffer(const webrtc::DesktopSize& view_size,
-                           const webrtc::DesktopRect& clip_area,
+  virtual void ApplyBuffer(const SkISize& view_size,
+                           const SkIRect& clip_area,
                            webrtc::DesktopFrame* buffer,
-                           const webrtc::DesktopRegion& region) OVERRIDE;
+                           const SkRegion& region) OVERRIDE;
   virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
-  virtual void SetSourceSize(const webrtc::DesktopSize& source_size,
-                             const webrtc::DesktopVector& dpi) OVERRIDE;
+  virtual void SetSourceSize(const SkISize& source_size,
+                             const SkIPoint& dpi) OVERRIDE;
 
  private:
   // Variables are to be used from the display thread.
@@ -49,8 +48,8 @@
   bool in_dtor_;
 
   FrameProducer* frame_producer_;
-  webrtc::DesktopSize view_size_;
-  webrtc::DesktopRect clip_area_;
+  SkISize view_size_;
+  SkIRect clip_area_;
 
   // If |provide_buffer_|, allocates a new buffer of |view_size_|, informs
   // Java about it, and tells the producer to draw onto it. Otherwise, no-op.