From 13b7a84041f48a558efb24725f0568b466b08cfd Mon Sep 17 00:00:00 2001 From: "dmaclach@chromium.org" Date: Fri, 30 Sep 2011 19:57:40 +0000 Subject: Revert 103523 - Move us fully from gfx:: over to skia types for consistency. BUG=NONE TEST=BUILD Review URL: http://codereview.chromium.org/7992011 TBR=dmaclach@chromium.org Review URL: http://codereview.chromium.org/8103006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103526 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/base/decoder_vp8.h | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'remoting/base/decoder_vp8.h') diff --git a/remoting/base/decoder_vp8.h b/remoting/base/decoder_vp8.h index 33ec147..7aab0fb 100644 --- a/remoting/base/decoder_vp8.h +++ b/remoting/base/decoder_vp8.h @@ -18,16 +18,15 @@ class DecoderVp8 : public Decoder { virtual ~DecoderVp8(); // Decoder implementations. - virtual void Initialize(scoped_refptr frame) OVERRIDE; - virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE; - virtual void GetUpdatedRects(RectVector* rects) OVERRIDE; - virtual bool IsReadyForData() OVERRIDE; - virtual void Reset() OVERRIDE; - virtual VideoPacketFormat::Encoding Encoding() OVERRIDE; - virtual void SetScaleRatios(double horizontal_ratio, - double vertical_ratio) OVERRIDE; - virtual void SetClipRect(const SkIRect& clip_rect) OVERRIDE; - virtual void RefreshRects(const RectVector& rects) OVERRIDE; + virtual void Initialize(scoped_refptr frame); + virtual DecodeResult DecodePacket(const VideoPacket* packet); + virtual void GetUpdatedRects(UpdatedRects* rects); + virtual bool IsReadyForData(); + virtual void Reset(); + virtual VideoPacketFormat::Encoding Encoding(); + virtual void SetScaleRatios(double horizontal_ratio, double vertical_ratio); + virtual void SetClipRect(const gfx::Rect& clip_rect); + virtual void RefreshRects(const std::vector& rects); private: enum State { @@ -41,14 +40,14 @@ class DecoderVp8 : public Decoder { // Perform color space conversion on the specified rectangles. // Write the updated rectangles to |output_rects|. - void ConvertRects(const RectVector& rects, - RectVector* output_rects); + void ConvertRects(const UpdatedRects& rects, + UpdatedRects* output_rects); // Perform scaling and color space conversion on the specified // rectangles. // Write the updated rectangles to |output_rects|. - void ScaleAndConvertRects(const RectVector& rects, - RectVector* output_rects); + void ScaleAndConvertRects(const UpdatedRects& rects, + UpdatedRects* output_rects); // The internal state of the decoder. State state_; @@ -62,10 +61,10 @@ class DecoderVp8 : public Decoder { vpx_image_t* last_image_; // Record the updated rects in the last decode. - RectVector updated_rects_; + UpdatedRects updated_rects_; // Clipping rect for the output of the decoder. - SkIRect clip_rect_; + gfx::Rect clip_rect_; // Scale factors of the decoded output. double horizontal_scale_ratio_; -- cgit v1.1