Switch over to using SkRegions to calculate dirty areas.

remoting/host/capturer.h

Index: remoting/host/capturer.h
diff --git a/remoting/host/capturer.h b/remoting/host/capturer.h
index 5b9529423813ed4419003bf2d4cc9bf294c5ed5a..3b12abdf0d7a526fd9227e7a02069c58c57cfec0 100644
--- a/remoting/host/capturer.h
+++ b/remoting/host/capturer.h
@@ -8,7 +8,7 @@
 #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 {
 
@@ -51,11 +51,11 @@ class Capturer {
   // 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;
@@ -65,19 +65,17 @@ class Capturer {
   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;