Index: remoting/client/plugin/pepper_view.h |
diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h |
index 030f70bf4d74cd2728c9c16114ae30e73e3f1502..1d52cffb9b341b6f2342cd94f126f5a9d1ebb7e5 100644 |
--- a/remoting/client/plugin/pepper_view.h |
+++ b/remoting/client/plugin/pepper_view.h |
@@ -19,7 +19,6 @@ |
#include "ppapi/cpp/point.h" |
#include "remoting/client/chromoting_view.h" |
#include "remoting/client/frame_consumer.h" |
-#include "ui/gfx/size.h" |
namespace remoting { |
@@ -56,24 +55,24 @@ class PepperView : public ChromotingView, |
Task* done); |
virtual void ReleaseFrame(media::VideoFrame* frame); |
virtual void OnPartialFrameOutput(media::VideoFrame* frame, |
- UpdatedRects* rects, |
+ RectVector* rects, |
Task* done); |
// This is called when the dimension of the plugin element has changed. |
// Return true if plugin size has changed, false otherwise. |
- bool SetPluginSize(const gfx::Size& plugin_size); |
+ bool SetPluginSize(const SkISize& plugin_size); |
private: |
void OnPaintDone(base::Time paint_start); |
// Set the dimension of the entire host screen. |
- void SetHostSize(const gfx::Size& host_size); |
+ void SetHostSize(const SkISize& host_size); |
- void PaintFrame(media::VideoFrame* frame, UpdatedRects* rects); |
+ void PaintFrame(media::VideoFrame* frame, RectVector* rects); |
// Render the rectangle of |frame| to the backing store. |
// Returns true if this rectangle is not clipped. |
- bool PaintRect(media::VideoFrame* frame, const gfx::Rect& rect); |
+ bool PaintRect(media::VideoFrame* frame, const SkIRect& rect); |
// Blanks out a rectangle in an image. |
void BlankRect(pp::ImageData& image_data, const pp::Rect& rect); |
@@ -99,10 +98,10 @@ class PepperView : public ChromotingView, |
bool flush_blocked_; |
// The size of the plugin element. |
- gfx::Size plugin_size_; |
+ SkISize plugin_size_; |
// The size of the host screen. |
- gfx::Size host_size_; |
+ SkISize host_size_; |
bool is_static_fill_; |
uint32 static_fill_color_; |