Index: remoting/base/decoder.h |
diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h |
index b13483f0918e28f2835b7bc0e2056bf1b9dea116..dded4843f484dea50dda1d2113774a24044decb1 100644 |
--- a/remoting/base/decoder.h |
+++ b/remoting/base/decoder.h |
@@ -11,11 +11,11 @@ |
#include "base/task.h" |
#include "media/base/video_frame.h" |
#include "remoting/proto/video.pb.h" |
-#include "ui/gfx/rect.h" |
+#include "third_party/skia/include/core/SkRect.h" |
namespace remoting { |
-typedef std::vector<gfx::Rect> UpdatedRects; |
+typedef std::vector<SkIRect> RectVector; |
// Interface for a decoder that takes a stream of bytes from the network and |
// outputs frames of data. |
@@ -46,9 +46,7 @@ class Decoder { |
// Returns rects that were updated in the last frame. Can be called only |
// after DecodePacket returned DECODE_DONE. Caller keeps ownership of |
// |rects|. |rects| is kept empty if whole screen needs to be updated. |
- // TODO(dmaclach): Move this over to using SkRegion. |
- // http://crbug.com/92085 |
- virtual void GetUpdatedRects(UpdatedRects* rects) = 0; |
+ virtual void GetUpdatedRects(RectVector* rects) = 0; |
// Reset the decoder to an uninitialized state. Release all references to |
// the initialized |frame|. Initialize() must be called before the decoder |
@@ -71,13 +69,13 @@ class Decoder { |
// effective on the next decoded video frame. |
// |
// When scaling is enabled clipping rectangles are ignored. |
- virtual void SetClipRect(const gfx::Rect& clip_rect) {} |
+ virtual void SetClipRect(const SkIRect& clip_rect) {} |
// Force decoder to output a video frame with content in |rects| using the |
// last decoded video frame. |
// |
// Coordinates of rectangles supplied here are before scaling. |
- virtual void RefreshRects(const std::vector<gfx::Rect>& rects) {} |
+ virtual void RefreshRects(const RectVector& rects) {} |
}; |
} // namespace remoting |