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

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

 // Copyright 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.
 
 #ifndef REMOTING_CLIENT_JNI_JNI_FRAME_CONSUMER_H_
 #define REMOTING_CLIENT_JNI_JNI_FRAME_CONSUMER_H_
 
 #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;
 }  // namespace webrtc
 
 namespace remoting {
 class ChromotingJniRuntime;
 class FrameProducer;
 
 // FrameConsumer implementation that draws onto a JNI direct byte buffer.
 class JniFrameConsumer : public FrameConsumer {
  public:
   // The instance does not take ownership of |jni_runtime|.
   explicit JniFrameConsumer(ChromotingJniRuntime* jni_runtime);
 
   virtual ~JniFrameConsumer();
 
   // This must be called once before the producer's source size is set.
   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.
 
   // Used to obtain task runner references and make calls to Java methods.
   ChromotingJniRuntime* jni_runtime_;
 
   // Whether we're currently in the constructor, and should deallocate the
   // buffer instead of passing it back to the producer.
   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.
   void AllocateBuffer();
 
   DISALLOW_COPY_AND_ASSIGN(JniFrameConsumer);
 };
 
 }  // namespace remoting
 
 #endif