Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: remoting/base/encoder_vp8_unittest.cc

Issue 7992011: Move us fully from gfx:: over to skia types for consistency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix for bad DEPS Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/encoder_vp8.cc ('k') | remoting/base/util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/encoder_vp8_unittest.cc
diff --git a/remoting/base/encoder_vp8_unittest.cc b/remoting/base/encoder_vp8_unittest.cc
index 0be53d51739e6c10176813c3d6840ebd81bbf80f..73fb15739524795217050eda1007ded5f1ecc877 100644
--- a/remoting/base/encoder_vp8_unittest.cc
+++ b/remoting/base/encoder_vp8_unittest.cc
@@ -49,12 +49,12 @@ TEST(EncoderVp8Test, TestSizeChangeNoLeak) {
planes.strides[0] = width;
scoped_refptr<CaptureData> capture_data(new CaptureData(
- planes, gfx::Size(width, height), media::VideoFrame::RGB32));
+ planes, SkISize::Make(width, height), media::VideoFrame::RGB32));
encoder.Encode(capture_data, false,
NewCallback(&callback, &EncoderCallback::DataAvailable));
height /= 2;
- capture_data = new CaptureData(planes, gfx::Size(width, height),
+ capture_data = new CaptureData(planes, SkISize::Make(width, height),
media::VideoFrame::RGB32);
encoder.Encode(capture_data, false,
NewCallback(&callback, &EncoderCallback::DataAvailable));
@@ -62,25 +62,25 @@ TEST(EncoderVp8Test, TestSizeChangeNoLeak) {
TEST(EncoderVp8Test, AlignAndClipRect) {
// Simple test case (no clipping).
- gfx::Rect r1(100, 200, 300, 400);
+ SkIRect r1(SkIRect::MakeXYWH(100, 200, 300, 400));
EXPECT_EQ(EncoderVp8::AlignAndClipRect(r1, kIntMax, kIntMax), r1);
// Should expand outward to r1.
- gfx::Rect r2(101, 201, 298, 398);
+ SkIRect r2(SkIRect::MakeXYWH(101, 201, 298, 398));
EXPECT_EQ(EncoderVp8::AlignAndClipRect(r2, kIntMax, kIntMax), r1);
// Test clipping to screen size.
EXPECT_EQ(EncoderVp8::AlignAndClipRect(r1, 110, 220),
- gfx::Rect(100, 200, 10, 20));
+ SkIRect::MakeXYWH(100, 200, 10, 20));
// Rectangle completely off-screen.
- EXPECT_TRUE(EncoderVp8::AlignAndClipRect(r1, 50, 50).IsEmpty());
+ EXPECT_TRUE(EncoderVp8::AlignAndClipRect(r1, 50, 50).isEmpty());
// Clipping to odd-sized screen. An unlikely case, and we might not deal
// with it cleanly in the encoder (we possibly lose 1px at right & bottom
// of screen).
EXPECT_EQ(EncoderVp8::AlignAndClipRect(r1, 199, 299),
- gfx::Rect(100, 200, 98, 98));
+ SkIRect::MakeXYWH(100, 200, 98, 98));
}
} // namespace remoting
« no previous file with comments | « remoting/base/encoder_vp8.cc ('k') | remoting/base/util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698