Switch over to using SkRegions to calculate dirty areas.

remoting/host/capturer_fake_ascii.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_ascii.h"
 
 #include "ui/gfx/rect.h"
 
 namespace remoting {
 
@@ skipping 19 matching lines @@
   int buffer_size = height_ * bytes_per_row_;
   for (int i = 0; i < kNumBuffers; i++) {
     buffers_[i].reset(new uint8[buffer_size]);
   }
 }
 
 media::VideoFrame::Format CapturerFakeAscii::pixel_format() const {
   return pixel_format_;
 }
 
-void CapturerFakeAscii::ClearInvalidRects() {
-  helper.ClearInvalidRects();
+void CapturerFakeAscii::ClearInvalidRegion() {
+  helper_.ClearInvalidRegion();
 }
 
-void CapturerFakeAscii::InvalidateRects(const InvalidRects& inval_rects) {
-  helper.InvalidateRects(inval_rects);
+void CapturerFakeAscii::InvalidateRegion(const SkRegion& invalid_region) {
+  helper_.InvalidateRegion(invalid_region);
 }
 
 void CapturerFakeAscii::InvalidateScreen(const gfx::Size& size) {
-  helper.InvalidateScreen(size);
+  helper_.InvalidateScreen(size);
 }
 
 void CapturerFakeAscii::InvalidateFullScreen() {
-  helper.InvalidateFullScreen();
+  helper_.InvalidateFullScreen();
 }
 
-void CapturerFakeAscii::CaptureInvalidRects(
+void CapturerFakeAscii::CaptureInvalidRegion(
     CaptureCompletedCallback* callback) {
   scoped_ptr<CaptureCompletedCallback> callback_deleter(callback);
 
   GenerateImage();
   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, gfx::Size(width_, height_), pixel_format_));
 
-  helper.set_size_most_recent(capture_data->size());
+  helper_.set_size_most_recent(capture_data->size());
 
   callback->Run(capture_data);
 }
 
 const gfx::Size& CapturerFakeAscii::size_most_recent() const {
-  return helper.size_most_recent();
+  return helper_.size_most_recent();
 }
 
 void CapturerFakeAscii::GenerateImage() {
   for (int y = 0; y < height_; ++y) {
     uint8* row = buffers_[current_buffer_].get() + bytes_per_row_ * y;
     for (int x = 0; x < bytes_per_row_; ++x) {
       if (y == 0 || x == 0 || x == (width_ - 1) || y == (height_ - 1)) {
         row[x] = '*';
       } else {
         row[x] = ' ';
       }
     }
   }
 }
 
 }  // namespace remoting