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

> Remove dependency on Skia from chromoting client.
> 
> Now DesktopRegion, DesktopRect and DesktopSize are used instead of
> corresponding skia types.
> 
> TBR=reed@google.com (for _moved_ skia dependency)
> 
> Review URL: https://chromiumcodereview.appspot.com/23440046

TBR=sergeyu@chromium.org

Review URL: https://codereview.chromium.org/24217003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224205 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 9 deletions

diff --git a/remoting/client/frame_consumer.h b/remoting/client/frame_consumer.h
index 4df7595..b5f937c 100644
--- a/remoting/client/frame_consumer.h
+++ b/remoting/client/frame_consumer.h
@@ -6,13 +6,12 @@
 #define REMOTING_CLIENT_FRAME_CONSUMER_H_
 
 #include "base/basictypes.h"
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "third_party/skia/include/core/SkSize.h"
 
 namespace webrtc {
 class DesktopFrame;
-class DesktopRect;
-class DesktopRegion;
-class DesktopSize;
-class DesktopVector;
 }  // namespace webrtc
 
 namespace remoting {
@@ -27,10 +26,10 @@ class FrameConsumer {
   //
   // N.B. Both |clip_area| and |region| are in output coordinates relative to
   // the frame.
-  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) = 0;
+                           const SkRegion& region) = 0;
 
   // Accepts a buffer that couldn't be used for drawing for any reason (shutdown
   // is in progress, the view area has changed, etc.). The accepted buffer can
@@ -38,8 +37,8 @@ class FrameConsumer {
   virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) = 0;
 
   // Set the dimension of the entire host screen.
-  virtual void SetSourceSize(const webrtc::DesktopSize& source_size,
-                             const webrtc::DesktopVector& dpi) = 0;
+  virtual void SetSourceSize(const SkISize& source_size,
+                             const SkIPoint& dpi) = 0;
 
  protected:
   FrameConsumer() {}