| Index: remoting/codec/video_decoder_verbatim.h
|
| diff --git a/remoting/codec/video_decoder_verbatim.h b/remoting/codec/video_decoder_verbatim.h
|
| index 96b75e21f7e01a9ce1790da168ebfde76a72ad88..ae723796145d1ec6156bd32cd4cdd651fb3c6e35 100644
|
| --- a/remoting/codec/video_decoder_verbatim.h
|
| +++ b/remoting/codec/video_decoder_verbatim.h
|
| @@ -8,6 +8,8 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "remoting/codec/video_decoder.h"
|
| +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
|
| +#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
|
|
|
| namespace remoting {
|
|
|
| @@ -22,24 +24,24 @@ class VideoDecoderVerbatim : public VideoDecoder {
|
|
|
| // VideoDecoder implementation.
|
| virtual bool IsReadyForData() OVERRIDE;
|
| - virtual void Initialize(const SkISize& screen_size) OVERRIDE;
|
| + virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE;
|
| virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE;
|
| virtual VideoPacketFormat::Encoding Encoding() OVERRIDE;
|
| - virtual void Invalidate(const SkISize& view_size,
|
| - const SkRegion& region) OVERRIDE;
|
| - virtual void RenderFrame(const SkISize& view_size,
|
| - const SkIRect& clip_area,
|
| + virtual void Invalidate(const webrtc::DesktopSize& view_size,
|
| + const webrtc::DesktopRegion& region) OVERRIDE;
|
| + virtual void RenderFrame(const webrtc::DesktopSize& view_size,
|
| + const webrtc::DesktopRect& clip_area,
|
| uint8* image_buffer,
|
| int image_stride,
|
| - SkRegion* output_region) OVERRIDE;
|
| - virtual const SkRegion* GetImageShape() OVERRIDE;
|
| + webrtc::DesktopRegion* output_region) OVERRIDE;
|
| + virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE;
|
|
|
| private:
|
| // The region updated that hasn't been copied to the screen yet.
|
| - SkRegion updated_region_;
|
| + webrtc::DesktopRegion updated_region_;
|
|
|
| // Size of the remote screen.
|
| - SkISize screen_size_;
|
| + webrtc::DesktopSize screen_size_;
|
|
|
| // The bitmap holding the remote screen bits.
|
| scoped_ptr<uint8[]> screen_buffer_;
|
|
|