Switch over to using SkRegions to calculate dirty areas.

remoting/host/capturer.h

 // 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.
 
 #ifndef REMOTING_HOST_CAPTURER_H_
 #define REMOTING_HOST_CAPTURER_H_
 
 #include "base/basictypes.h"
 #include "base/callback_old.h"
 #include "remoting/base/capture_data.h"
-#include "remoting/base/types.h"
+#include "third_party/skia/include/core/SkRegion.h"
 
 namespace remoting {
 
 // A class to perform the task of capturing the image of a window.
 // The capture action is asynchronous to allow maximum throughput.
 //
 // The full capture process is as follows:
 //
 // (1) InvalidateRects
 //     This is an optional step where regions of the screen are marked as
@@ skipping 22 matching lines @@
 
   // Create platform-specific capturer.
   static Capturer* Create();
 
   // Called when the screen configuration is changed.
   virtual void ScreenConfigurationChanged() = 0;
 
   // Return the pixel format of the screen.
   virtual media::VideoFrame::Format pixel_format() const = 0;
 
-  // Clear out the list of invalid rects.
-  virtual void ClearInvalidRects() = 0;
+  // Clear out the invalid region.
+  virtual void ClearInvalidRegion() = 0;
 
-  // Invalidate the specified screen rects.
-  virtual void InvalidateRects(const InvalidRects& inval_rects) = 0;
+  // Invalidate the specified region.
+  virtual void InvalidateRegion(const SkRegion& inval_region) = 0;

[Wez, 2011/08/08 20:49:34]

nit: This should be |region|, |dirty_region| or |invalid_region|, to fit the
style guide.

[dmac, 2011/08/10 20:30:36]

Seriously? Fixed all over :-)

 
   // Invalidate the entire screen, of a given size.
   virtual void InvalidateScreen(const gfx::Size& size) = 0;
 
   // Invalidate the entire screen, using the size of the most recently
   // captured screen.
   virtual void InvalidateFullScreen() = 0;
 
   // Capture the screen data associated with each of the accumulated
-  // rects in |inval_rects|.
-  // This routine will first call CalculateInvalidRects to update the
-  // list of |inval_rects|.
+  // dirty region.
   // When the capture is complete, |callback| is called.
   //
-  // If |inval_rects_| is empty, then this does nothing except
+  // If the dirty region is empty, then this does nothing except
   // call the |callback| routine.

[Wez, 2011/08/08 20:49:34]

nit: These two sentences could be combined, i.e. "... even if the dirty region
is empty".

[dmac, 2011/08/10 20:30:36]

Done.

   //
   // It is OK to call this method while another thread is reading
   // data of the last capture.
   // There can be at most one concurrent read going on when this
   // method is called.
-  virtual void CaptureInvalidRects(CaptureCompletedCallback* callback) = 0;
+  virtual void CaptureInvalidRegion(CaptureCompletedCallback* callback) = 0;
 
   // Get the size of the most recently captured screen.
   virtual const gfx::Size& size_most_recent() const = 0;
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CAPTURER_H_