| Index: remoting/client/rectangle_update_decoder.h
|
| diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h
|
| index 6d46a1efa9739422ab1e09afa44987b6f21bdcd0..3c7468a082165b2629095ecd7375e703cb3f0e32 100644
|
| --- a/remoting/client/rectangle_update_decoder.h
|
| +++ b/remoting/client/rectangle_update_decoder.h
|
| @@ -15,6 +15,7 @@
|
| #include "remoting/client/frame_consumer_proxy.h"
|
| #include "remoting/client/frame_producer.h"
|
| #include "remoting/protocol/video_stub.h"
|
| +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
|
|
|
| namespace base {
|
| class SingleThreadTaskRunner;
|
| @@ -52,11 +53,12 @@ class RectangleUpdateDecoder
|
| // FrameProducer implementation. These methods may be called before we are
|
| // Initialize()d, or we know the source screen size.
|
| virtual void DrawBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
|
| - virtual void InvalidateRegion(const SkRegion& region) OVERRIDE;
|
| + virtual void InvalidateRegion(const webrtc::DesktopRegion& region) OVERRIDE;
|
| virtual void RequestReturnBuffers(const base::Closure& done) OVERRIDE;
|
| - virtual void SetOutputSizeAndClip(const SkISize& view_size,
|
| - const SkIRect& clip_area) OVERRIDE;
|
| - virtual const SkRegion* GetBufferShape() OVERRIDE;
|
| + virtual void SetOutputSizeAndClip(
|
| + const webrtc::DesktopSize& view_size,
|
| + const webrtc::DesktopRect& clip_area) OVERRIDE;
|
| + virtual const webrtc::DesktopRegion* GetBufferShape() OVERRIDE;
|
|
|
| // VideoStub implementation.
|
| virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
|
| @@ -89,14 +91,14 @@ class RectangleUpdateDecoder
|
| scoped_ptr<VideoDecoder> decoder_;
|
|
|
| // Remote screen size in pixels.
|
| - SkISize source_size_;
|
| + webrtc::DesktopSize source_size_;
|
|
|
| // Vertical and horizontal DPI of the remote screen.
|
| - SkIPoint source_dpi_;
|
| + webrtc::DesktopVector source_dpi_;
|
|
|
| // The current dimensions of the frame consumer view.
|
| - SkISize view_size_;
|
| - SkIRect clip_area_;
|
| + webrtc::DesktopSize view_size_;
|
| + webrtc::DesktopRect clip_area_;
|
|
|
| // The drawing buffers supplied by the frame consumer.
|
| std::list<webrtc::DesktopFrame*> buffers_;
|
|
|