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

trunk/src/remoting/base/util.h

Index: trunk/src/remoting/base/util.h
===================================================================
--- trunk/src/remoting/base/util.h	(revision 224204)
+++ trunk/src/remoting/base/util.h	(working copy)
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "media/base/video_frame.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
+#include "third_party/skia/include/core/SkRect.h"
 
 namespace remoting {
 
@@ -36,19 +36,18 @@
 //
 // N.B. The top left corner coordinates of YUV buffer should have even X and Y
 // coordinates.
-void ConvertAndScaleYUVToRGB32Rect(
-    const uint8* source_yplane,
-    const uint8* source_uplane,
-    const uint8* source_vplane,
-    int source_ystride,
-    int source_uvstride,
-    const webrtc::DesktopSize& source_size,
-    const webrtc::DesktopRect& source_buffer_rect,
-    uint8* dest_buffer,
-    int dest_stride,
-    const webrtc::DesktopSize& dest_size,
-    const webrtc::DesktopRect& dest_buffer_rect,
-    const webrtc::DesktopRect& dest_rect);
+void ConvertAndScaleYUVToRGB32Rect(const uint8* source_yplane,
+                                   const uint8* source_uplane,
+                                   const uint8* source_vplane,
+                                   int source_ystride,
+                                   int source_uvstride,
+                                   const SkISize& source_size,
+                                   const SkIRect& source_buffer_rect,
+                                   uint8* dest_buffer,
+                                   int dest_stride,
+                                   const SkISize& dest_size,
+                                   const SkIRect& dest_buffer_rect,
+                                   const SkIRect& dest_rect);
 
 // Convert RGB32 to YUV on a specific rectangle.
 void ConvertRGB32ToYUVWithRect(const uint8* rgb_plane,
@@ -66,23 +65,23 @@
 int RoundToTwosMultiple(int x);
 
 // Align the sides of the rectangle to multiples of 2 (expanding outwards).
-webrtc::DesktopRect AlignRect(const webrtc::DesktopRect& rect);
+SkIRect AlignRect(const SkIRect& rect);
 
 // Scales the supplied rectangle from |in_size| coordinates to |out_size|.
 // If the result has non-integer coordinates then the smallest integer-
 // coordinate rectangle that wholly encloses it is returned.
-webrtc::DesktopRect ScaleRect(const webrtc::DesktopRect& rect,
-                              const webrtc::DesktopSize& in_size,
-                              const webrtc::DesktopSize& out_size);
+SkIRect ScaleRect(const SkIRect& rect,
+                  const SkISize& in_size,
+                  const SkISize& out_size);
 
 // Copy content of a rectangle in a RGB32 image.
 void CopyRGB32Rect(const uint8* source_buffer,
                    int source_stride,
-                   const webrtc::DesktopRect& source_buffer_rect,
+                   const SkIRect& source_buffer_rect,
                    uint8* dest_buffer,
                    int dest_stride,
-                   const webrtc::DesktopRect& dest_buffer_rect,
-                   const webrtc::DesktopRect& dest_rect);
+                   const SkIRect& dest_buffer_rect,
+                   const SkIRect& dest_rect);
 
 // Replaces every occurrence of "\n" in a string by "\r\n".
 std::string ReplaceLfByCrLf(const std::string& in);
@@ -97,9 +96,6 @@
 // error or if not implemented.
 std::string GetUsername();
 
-bool DoesRectContain(const webrtc::DesktopRect& a,
-                     const webrtc::DesktopRect& b);
-
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_UTIL_H_