Index: remoting/codec/codec_test.cc |
diff --git a/remoting/codec/codec_test.cc b/remoting/codec/codec_test.cc |
index eebe2634d6f0a65b3f3777c03911fd84be0c0b58..e63ec3e50719ca31d448a565f5ccb4572889d67f 100644 |
--- a/remoting/codec/codec_test.cc |
+++ b/remoting/codec/codec_test.cc |
@@ -64,12 +64,12 @@ class VideoDecoderTester { |
view_size_.width() * view_size_.height() * kBytesPerPixel]); |
EXPECT_TRUE(image_data_.get()); |
decoder_->Initialize( |
- SkISize::Make(screen_size_.width(), screen_size_.height())); |
+ webrtc::DesktopSize(screen_size_.width(), screen_size_.height())); |
} |
void Reset() { |
expected_region_.Clear(); |
- update_region_.setEmpty(); |
+ update_region_.Clear(); |
} |
void ResetRenderedData() { |
@@ -85,10 +85,9 @@ class VideoDecoderTester { |
void RenderFrame() { |
decoder_->RenderFrame( |
- SkISize::Make(view_size_.width(), view_size_.height()), |
- SkIRect::MakeWH(view_size_.width(), view_size_.height()), |
- image_data_.get(), |
- view_size_.width() * kBytesPerPixel, |
+ webrtc::DesktopSize(view_size_.width(), view_size_.height()), |
+ webrtc::DesktopRect::MakeWH(view_size_.width(), view_size_.height()), |
+ image_data_.get(), view_size_.width() * kBytesPerPixel, |
&update_region_); |
} |
@@ -121,14 +120,10 @@ class VideoDecoderTester { |
ASSERT_TRUE(frame_); |
// Test the content of the update region. |
- webrtc::DesktopRegion update_region; |
- for (SkRegion::Iterator i(update_region_); !i.done(); i.next()) { |
- update_region.AddRect(webrtc::DesktopRect::MakeXYWH( |
- i.rect().x(), i.rect().y(), i.rect().width(), i.rect().height())); |
- } |
- EXPECT_TRUE(expected_region_.Equals(update_region)); |
+ EXPECT_TRUE(expected_region_.Equals(update_region_)); |
- for (SkRegion::Iterator i(update_region_); !i.done(); i.next()) { |
+ for (webrtc::DesktopRegion::Iterator i(update_region_); !i.IsAtEnd(); |
+ i.Advance()) { |
const int stride = view_size_.width() * kBytesPerPixel; |
EXPECT_EQ(stride, frame_->stride()); |
const int offset = stride * i.rect().top() + |
@@ -153,7 +148,8 @@ class VideoDecoderTester { |
double max_error = 0.0; |
double sum_error = 0.0; |
int error_num = 0; |
- for (SkRegion::Iterator i(update_region_); !i.done(); i.next()) { |
+ for (webrtc::DesktopRegion::Iterator i(update_region_); !i.IsAtEnd(); |
+ i.Advance()) { |
const int stride = view_size_.width() * kBytesPerPixel; |
const int offset = stride * i.rect().top() + |
kBytesPerPixel * i.rect().left(); |
@@ -195,7 +191,7 @@ class VideoDecoderTester { |
DesktopSize view_size_; |
bool strict_; |
webrtc::DesktopRegion expected_region_; |
- SkRegion update_region_; |
+ webrtc::DesktopRegion update_region_; |
VideoDecoder* decoder_; |
scoped_ptr<uint8[]> image_data_; |
webrtc::DesktopFrame* frame_; |
@@ -377,8 +373,9 @@ void TestVideoEncoderDecoderGradient(VideoEncoder* encoder, |
// invalidates the frame. |
decoder_tester.ResetRenderedData(); |
decoder->Invalidate( |
- SkISize::Make(view_size.width(), view_size.height()), |
- SkRegion(SkIRect::MakeWH(view_size.width(), view_size.height()))); |
+ webrtc::DesktopSize(view_size.width(), view_size.height()), |
+ webrtc::DesktopRegion( |
+ webrtc::DesktopRect::MakeWH(view_size.width(), view_size.height()))); |
decoder_tester.RenderFrame(); |
decoder_tester.VerifyResultsApprox(expected_result->data(), |
max_error_limit, mean_error_limit); |