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

remoting/host/capturer_fake.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/capturer_fake.h"
 
 #include "ui/gfx/rect.h"
 
 namespace remoting {
 
@@ skipping 36 matching lines @@
   int buffer_size = size_.height() * bytes_per_row_;
   for (int i = 0; i < kNumBuffers; i++) {
     buffers_[i].reset(new uint8[buffer_size]);
   }
 }
 
 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) {
   helper.InvalidateScreen(size);
 }
 
 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();
   current_buffer_ = (current_buffer_ + 1) % kNumBuffers;
   planes.strides[0] = bytes_per_row_;
 
   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());
 
   callback->Run(capture_data);
 }
 
 const gfx::Size& CapturerFake::size_most_recent() const {
   return helper.size_most_recent();
 }
 
@@ skipping 24 matching lines @@
       row[x * kBytesPerPixel] = r;
       row[x * kBytesPerPixel+1] = g;
       row[x * kBytesPerPixel+2] = b;
       row[x * kBytesPerPixel+3] = 0xff;
     }
     row += bytes_per_row_;
   }
 }
 
 }  // namespace remoting