Revert 96327 - Switch over to using SkRegions to calculate dirty areas.

BUG=91619
TEST=Set up a remoting sesssion and make sure it works.

Review URL: http://codereview.chromium.org/7491070

TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/7622002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96328 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/remoting/host/capturer_fake.cc b/remoting/host/capturer_fake.cc
index 717e0ad..8f81b5b 100644
--- a/remoting/host/capturer_fake.cc
+++ b/remoting/host/capturer_fake.cc
@@ -54,12 +54,12 @@ media::VideoFrame::Format CapturerFake::pixel_format() const {
   return pixel_format_;
 }
 
-void CapturerFake::ClearInvalidRegion() {
-  helper.ClearInvalidRegion();
+void CapturerFake::ClearInvalidRects() {
+  helper.ClearInvalidRects();
 }
 
-void CapturerFake::InvalidateRegion(const SkRegion& invalid_region) {
-  helper.InvalidateRegion(invalid_region);
+void CapturerFake::InvalidateRects(const InvalidRects& inval_rects) {
+  helper.InvalidateRects(inval_rects);
 }
 
 void CapturerFake::InvalidateScreen(const gfx::Size& size) {
@@ -70,14 +70,14 @@ void CapturerFake::InvalidateFullScreen() {
   helper.InvalidateFullScreen();
 }
 
-void CapturerFake::CaptureInvalidRegion(CaptureCompletedCallback* callback) {
+void CapturerFake::CaptureInvalidRects(CaptureCompletedCallback* callback) {
   scoped_ptr<CaptureCompletedCallback> callback_deleter(callback);
 
   GenerateImage();
   InvalidateScreen(size_);
 
-  SkRegion invalid_region;
-  helper.SwapInvalidRegion(&invalid_region);
+  InvalidRects inval_rects;
+  helper.SwapInvalidRects(inval_rects);
 
   DataPlanes planes;
   planes.data[0] = buffers_[current_buffer_].get();
@@ -87,7 +87,7 @@ void CapturerFake::CaptureInvalidRegion(CaptureCompletedCallback* callback) {
   scoped_refptr<CaptureData> capture_data(new CaptureData(planes,
                                                           size_,
                                                           pixel_format_));
-  capture_data->mutable_dirty_region() = invalid_region;
+  capture_data->mutable_dirty_rects() = inval_rects;
 
   helper.set_size_most_recent(capture_data->size());