Switch over to using SkRegions to calculate dirty areas.

remoting/base/capture_data.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_BASE_CAPTURE_DATA_H_
 #define REMOTING_BASE_CAPTURE_DATA_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/video_frame.h"
-#include "remoting/base/types.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "ui/gfx/size.h"
 
 namespace remoting {
 
 struct DataPlanes {
   DataPlanes();
 
   static const int kPlaneCount = 3;
   uint8* data[kPlaneCount];
   int strides[kPlaneCount];
 };
 
 // Stores the data and information of a capture to pass off to the
 // encoding thread.
 class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
  public:
   CaptureData(const DataPlanes &data_planes,
               const gfx::Size& size,
               media::VideoFrame::Format format);
 
   // Get the data_planes data of the last capture.
   const DataPlanes& data_planes() const { return data_planes_; }
 
-  // Get the list of updated rectangles in the last capture. The result is
-  // written into |rects|.
-  const InvalidRects& dirty_rects() const { return dirty_rects_; }
+  // Get the dirty region from the last capture.

[Wez, 2011/08/10 22:05:43]

nit: "last" -> "previous", to avoid ambiguity...

+  const SkRegion& dirty_region() const { return dirty_region_; }
 
   // Return the size of the image captured.
   gfx::Size size() const { return size_; }
 
   // Get the pixel format of the image captured.
   media::VideoFrame::Format pixel_format() const { return pixel_format_; }
 
   // Mutating methods.
-  InvalidRects& mutable_dirty_rects() { return dirty_rects_; }
+  SkRegion& mutable_dirty_region() { return dirty_region_; }
 
   // Return the time spent on capturing.
   int capture_time_ms() const { return capture_time_ms_; }
 
   // Set the time spent on capturing.
   void set_capture_time_ms(int capture_time_ms) {
     capture_time_ms_ = capture_time_ms;
   }
 
   int64 client_sequence_number() const { return client_sequence_number_; }
 
   void set_client_sequence_number(int64 client_sequence_number) {
     client_sequence_number_ = client_sequence_number;
   }
 
  private:
   const DataPlanes data_planes_;
-  InvalidRects dirty_rects_;
+  SkRegion dirty_region_;
   gfx::Size size_;
   media::VideoFrame::Format pixel_format_;
 
   // Time spent in capture. Unit is in milliseconds.
   int capture_time_ms_;
 
   // Sequence number supplied by client for performance tracking.
   int64 client_sequence_number_;
 
   friend class base::RefCountedThreadSafe<CaptureData>;
   virtual ~CaptureData();
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_CAPTURE_DATA_H_