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, 5 insertions, 8 deletions

diff --git a/remoting/client/frame_consumer_proxy.cc b/remoting/client/frame_consumer_proxy.cc
index 4c7d79f..070130c 100644
--- a/remoting/client/frame_consumer_proxy.cc
+++ b/remoting/client/frame_consumer_proxy.cc
@@ -8,8 +8,6 @@
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 
 namespace remoting {
 
@@ -18,10 +16,10 @@ FrameConsumerProxy::FrameConsumerProxy(
     : task_runner_(task_runner) {
 }
 
-void FrameConsumerProxy::ApplyBuffer(const webrtc::DesktopSize& view_size,
-                                     const webrtc::DesktopRect& clip_area,
+void FrameConsumerProxy::ApplyBuffer(const SkISize& view_size,
+                                     const SkIRect& clip_area,
                                      webrtc::DesktopFrame* buffer,
-                                     const webrtc::DesktopRegion& region) {
+                                     const SkRegion& region) {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(FROM_HERE, base::Bind(
         &FrameConsumerProxy::ApplyBuffer, this,
@@ -44,9 +42,8 @@ void FrameConsumerProxy::ReturnBuffer(webrtc::DesktopFrame* buffer) {
     frame_consumer_->ReturnBuffer(buffer);
 }
 
-void FrameConsumerProxy::SetSourceSize(
-    const webrtc::DesktopSize& source_size,
-    const webrtc::DesktopVector& source_dpi) {
+void FrameConsumerProxy::SetSourceSize(const SkISize& source_size,
+                                       const SkIPoint& source_dpi) {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(FROM_HERE, base::Bind(
         &FrameConsumerProxy::SetSourceSize, this, source_size, source_dpi));