| Index: remoting/base/capture_data.h
|
| diff --git a/remoting/base/capture_data.h b/remoting/base/capture_data.h
|
| index b8592fad59898e8d85fe4fcd244c8f1761f0b9d7..ae5b89e9b190b27c3534cd9f745ca7ae0bdf2aab 100644
|
| --- a/remoting/base/capture_data.h
|
| +++ b/remoting/base/capture_data.h
|
| @@ -10,7 +10,8 @@
|
| #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 {
|
|
|
| @@ -30,12 +31,11 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
|
| const gfx::Size& size,
|
| media::VideoFrame::Format format);
|
|
|
| - // Get the data_planes data of the last capture.
|
| + // Get the data_planes data of the previous 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 previous capture.
|
| + const SkRegion& dirty_region() const { return dirty_region_; }
|
|
|
| // Return the size of the image captured.
|
| gfx::Size size() const { return size_; }
|
| @@ -44,7 +44,7 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
|
| 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_; }
|
| @@ -62,7 +62,7 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
|
|
|
| private:
|
| const DataPlanes data_planes_;
|
| - InvalidRects dirty_rects_;
|
| + SkRegion dirty_region_;
|
| gfx::Size size_;
|
| media::VideoFrame::Format pixel_format_;
|
|
|
|
|