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

trunk/src/remoting/client/plugin/chromoting_instance.cc

Index: trunk/src/remoting/client/plugin/chromoting_instance.cc
===================================================================
--- trunk/src/remoting/client/plugin/chromoting_instance.cc	(revision 224204)
+++ trunk/src/remoting/client/plugin/chromoting_instance.cc	(working copy)
@@ -351,8 +351,8 @@
   return input_handler_.HandleInputEvent(event);
 }
 
-void ChromotingInstance::SetDesktopSize(const webrtc::DesktopSize& size,
-                                        const webrtc::DesktopVector& dpi) {
+void ChromotingInstance::SetDesktopSize(const SkISize& size,
+                                        const SkIPoint& dpi) {
   mouse_input_filter_.set_output_size(size);
 
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
@@ -365,18 +365,18 @@
   PostChromotingMessage("onDesktopSize", data.Pass());
 }
 
-void ChromotingInstance::SetDesktopShape(const webrtc::DesktopRegion& shape) {
-  if (desktop_shape_ && shape.Equals(*desktop_shape_))
+void ChromotingInstance::SetDesktopShape(const SkRegion& shape) {
+  if (desktop_shape_ && shape == *desktop_shape_)
     return;
 
-  desktop_shape_.reset(new webrtc::DesktopRegion(shape));
+  desktop_shape_.reset(new SkRegion(shape));
 
   scoped_ptr<base::ListValue> rects_value(new base::ListValue());
-  for (webrtc::DesktopRegion::Iterator i(shape); !i.IsAtEnd(); i.Advance()) {
-    const webrtc::DesktopRect& rect = i.rect();
+  for (SkRegion::Iterator i(shape); !i.done(); i.next()) {
+    SkIRect rect = i.rect();
     scoped_ptr<base::ListValue> rect_value(new base::ListValue());
-    rect_value->AppendInteger(rect.left());
-    rect_value->AppendInteger(rect.top());
+    rect_value->AppendInteger(rect.x());
+    rect_value->AppendInteger(rect.y());
     rect_value->AppendInteger(rect.width());
     rect_value->AppendInteger(rect.height());
     rects_value->Append(rect_value.release());