Index: remoting/base/util_unittest.cc |
diff --git a/remoting/base/util_unittest.cc b/remoting/base/util_unittest.cc |
index a269c076ce53ab37a64267118cdbff07ae07422c..1dad9aabdcc12c517126ed389ce9f8fd86fc9620 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,15 @@ 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), |
+ rect.right() + ((i & 4) ? 1 : 0), |
+ rect.bottom() + ((i & 8) ? 1 : 0)); |
tester.RunTest(dest_size, dest_rect); |
} |
@@ -167,18 +166,16 @@ 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), |
+ rect.right() + ((i & 4) ? 1 : 0), |
+ rect.bottom() + ((i & 8) ? 1 : 0)); |
tester.RunTest(dest_size, dest_rect); |
} |