| Index: remoting/client/rectangle_update_decoder.h
|
| diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h
|
| index 7394bd4e40257fba32a17ea4be41d13a62850927..d44bb6fae97580b559697c8867d2ba558e239040 100644
|
| --- a/remoting/client/rectangle_update_decoder.h
|
| +++ b/remoting/client/rectangle_update_decoder.h
|
| @@ -9,8 +9,6 @@
|
| #include "base/task.h"
|
| #include "media/base/video_frame.h"
|
| #include "remoting/base/decoder.h"
|
| -#include "ui/gfx/rect.h"
|
| -#include "ui/gfx/size.h"
|
|
|
| class MessageLoop;
|
|
|
| @@ -54,7 +52,7 @@ class RectangleUpdateDecoder :
|
| // report dirty rectangles accordingly to enhance performance.
|
| //
|
| // If scale ratio is not 1.0 then clipping rectangle is ignored.
|
| - void UpdateClipRect(const gfx::Rect& clip_rect);
|
| + void UpdateClipRect(const SkIRect& clip_rect);
|
|
|
| // Force the decoder to output the last decoded video frame without any
|
| // clipping.
|
| @@ -68,7 +66,7 @@ class RectangleUpdateDecoder :
|
|
|
| void AllocateFrame(const VideoPacket* packet, Task* done);
|
| void ProcessPacketData(const VideoPacket* packet, Task* done);
|
| - void RefreshRects(const std::vector<gfx::Rect>& rects);
|
| + void RefreshRects(const RectVector& rects);
|
|
|
| // Obtain updated rectangles from decoder and submit it to the consumer.
|
| void SubmitToConsumer();
|
| @@ -85,9 +83,9 @@ class RectangleUpdateDecoder :
|
| MessageLoop* message_loop_;
|
| FrameConsumer* consumer_;
|
|
|
| - gfx::Size initial_screen_size_;
|
| - gfx::Rect clip_rect_;
|
| - std::vector<gfx::Rect> refresh_rects_;
|
| + SkISize initial_screen_size_;
|
| + SkIRect clip_rect_;
|
| + RectVector refresh_rects_;
|
|
|
| scoped_ptr<Decoder> decoder_;
|
|
|
|
|