Remove dependency on Skia from chromoting client.

remoting/base/util_unittest.cc

Index: remoting/base/util_unittest.cc
diff --git a/remoting/base/util_unittest.cc b/remoting/base/util_unittest.cc
index a269c076ce53ab37a64267118cdbff07ae07422c..c63bb76f774603c65e83f830853f4e274068cf9a 100644
--- a/remoting/base/util_unittest.cc
+++ b/remoting/base/util_unittest.cc
@@ -6,8 +6,7 @@
 
 #include "remoting/base/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkRect.h"
-#include "third_party/skia/include/core/SkSize.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 static const int kWidth = 32 ;
 static const int kHeight = 24 ;
@@ -45,7 +44,7 @@ class YuvToRgbTester {
     memset(rgb_buffer_.get(), 0, rgb_buffer_size_);
   }
 
-  void FillRgbBuffer(const SkIRect& rect) {
+  void FillRgbBuffer(const webrtc::DesktopRect& rect) {
     uint32* ptr = reinterpret_cast<uint32*>(
         rgb_buffer_.get() + (rect.top() * kRgbStride) +
         (rect.left() * kBytesPerPixel));
@@ -57,7 +56,7 @@ class YuvToRgbTester {
   }
 
   // Check the the desination buffer is filled within expected bounds.
-  void  CheckRgbBuffer(const SkIRect& rect) {
+  void  CheckRgbBuffer(const webrtc::DesktopRect& rect) {
     uint32* ptr = reinterpret_cast<uint32*>(rgb_buffer_.get());
     for (int y = 0; y < kHeight; ++y) {
       if (y < rect.top() || rect.bottom() <= y) {
@@ -81,8 +80,10 @@ class YuvToRgbTester {
     }
   }
 
-  void RunTest(const SkISize dest_size, const SkIRect& rect) {
-    ASSERT_TRUE(SkIRect::MakeSize(dest_size).contains(rect));
+  void RunTest(const webrtc::DesktopSize dest_size,
+               const webrtc::DesktopRect& rect) {
+    ASSERT_TRUE(
+        DoesRectContain(webrtc::DesktopRect::MakeSize(dest_size), rect));
 
     // Reset buffers.
     ResetYuvBuffer();
@@ -109,12 +110,12 @@ class YuvToRgbTester {
                                   vplane_,
                                   kYStride,
                                   kUvStride,
-                                  SkISize::Make(kWidth, kHeight),
-                                  SkIRect::MakeWH(kWidth, kHeight),
+                                  webrtc::DesktopSize(kWidth, kHeight),
+                                  webrtc::DesktopRect::MakeWH(kWidth, kHeight),
                                   rgb_buffer_.get(),
                                   kRgbStride,
                                   dest_size,
-                                  SkIRect::MakeSize(dest_size),
+                                  webrtc::DesktopRect::MakeSize(dest_size),
                                   rect);
 
     // Check if it worked out.
@@ -123,7 +124,8 @@ class YuvToRgbTester {
 
   void TestBasicConversion() {
     // Whole buffer.
-    RunTest(SkISize::Make(kWidth, kHeight), SkIRect::MakeWH(kWidth, kHeight));
+    RunTest(webrtc::DesktopSize(kWidth, kHeight),
+            webrtc::DesktopRect::MakeWH(kWidth, kHeight));
   }
 
  private:
@@ -147,18 +149,13 @@ TEST(YuvToRgbTest, BasicConversion) {
 TEST(YuvToRgbTest, Clipping) {
   YuvToRgbTester tester;
 
-  SkISize dest_size = SkISize::Make(kWidth, kHeight);
-  SkIRect rect = SkIRect::MakeLTRB(0, 0, kWidth - 1, kHeight - 1);
+  webrtc::DesktopSize dest_size = webrtc::DesktopSize(kWidth, kHeight);
+  webrtc::DesktopRect rect =
+      webrtc::DesktopRect::MakeLTRB(0, 0, kWidth - 1, kHeight - 1);
   for (int i = 0; i < 16; ++i) {
-    SkIRect dest_rect = rect;
-    if ((i & 1) != 0)
-      dest_rect.fLeft += 1;
-    if ((i & 2) != 0)
-      dest_rect.fTop += 1;
-    if ((i & 4) != 0)
-      dest_rect.fRight += 1;
-    if ((i & 8) != 0)
-      dest_rect.fBottom += 1;
+    webrtc::DesktopRect dest_rect = webrtc::DesktopRect::MakeLTRB(
+        rect.left() + ((i & 1) ? 1 : 0), rect.top() + ((i & 2) ? 1 : 0),

[alexeypa (please no reviews), 2013/09/18 23:04:05]

nit: I think having each parameter on a separate line is more readable in this
case. It is easier to parse parenthesis.

[Sergey Ulanov, 2013/09/18 23:26:58]

I agree. That's how clang-format decided to format this code.

+        rect.right() + ((i & 4) ? 1 : 0), rect.bottom() + ((i & 8) ? 1 : 0));
 
     tester.RunTest(dest_size, dest_rect);
   }
@@ -167,18 +164,14 @@ TEST(YuvToRgbTest, Clipping) {
 TEST(YuvToRgbTest, ClippingAndScaling) {
   YuvToRgbTester tester;
 
-  SkISize dest_size = SkISize::Make(kWidth - 10, kHeight - 10);
-  SkIRect rect = SkIRect::MakeLTRB(5, 5, kWidth - 11, kHeight - 11);
+  webrtc::DesktopSize dest_size =
+      webrtc::DesktopSize(kWidth - 10, kHeight - 10);
+  webrtc::DesktopRect rect =
+      webrtc::DesktopRect::MakeLTRB(5, 5, kWidth - 11, kHeight - 11);
   for (int i = 0; i < 16; ++i) {
-    SkIRect dest_rect = rect;
-    if ((i & 1) != 0)
-      dest_rect.fLeft += 1;
-    if ((i & 2) != 0)
-      dest_rect.fTop += 1;
-    if ((i & 4) != 0)
-      dest_rect.fRight += 1;
-    if ((i & 8) != 0)
-      dest_rect.fBottom += 1;
+    webrtc::DesktopRect dest_rect = webrtc::DesktopRect::MakeLTRB(
+        rect.left() + ((i & 1) ? 1 : 0), rect.top() + ((i & 2) ? 1 : 0),

[alexeypa (please no reviews), 2013/09/18 23:04:05]

nit: Same as above.

[Sergey Ulanov, 2013/09/18 23:26:58]

Done.

+        rect.right() + ((i & 4) ? 1 : 0), rect.bottom() + ((i & 8) ? 1 : 0));
 
     tester.RunTest(dest_size, dest_rect);
   }