| Index: cc/io_surface_draw_quad.h
|
| diff --git a/cc/io_surface_draw_quad.h b/cc/io_surface_draw_quad.h
|
| index bb5b028291394adc2d4948f69de4466d2d2e56a2..bce3dd50f2ead6e8002cdd527de8b7dd90f890bc 100644
|
| --- a/cc/io_surface_draw_quad.h
|
| +++ b/cc/io_surface_draw_quad.h
|
| @@ -6,8 +6,8 @@
|
| #define CCIOSurfaceDrawQuad_h
|
|
|
| #include "CCDrawQuad.h"
|
| -#include "IntSize.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "ui/gfx/size.h"
|
|
|
| namespace cc {
|
|
|
| @@ -20,17 +20,17 @@ public:
|
| Unflipped
|
| };
|
|
|
| - static scoped_ptr<CCIOSurfaceDrawQuad> create(const CCSharedQuadState*, const IntRect&, const IntSize& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation);
|
| + static scoped_ptr<CCIOSurfaceDrawQuad> create(const CCSharedQuadState*, const gfx::Rect&, const gfx::Size& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation);
|
|
|
| - IntSize ioSurfaceSize() const { return m_ioSurfaceSize; }
|
| + gfx::Size ioSurfaceSize() const { return m_ioSurfaceSize; }
|
| unsigned ioSurfaceTextureId() const { return m_ioSurfaceTextureId; }
|
| Orientation orientation() const { return m_orientation; }
|
|
|
| static const CCIOSurfaceDrawQuad* materialCast(const CCDrawQuad*);
|
| private:
|
| - CCIOSurfaceDrawQuad(const CCSharedQuadState*, const IntRect&, const IntSize& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation);
|
| + CCIOSurfaceDrawQuad(const CCSharedQuadState*, const gfx::Rect&, const gfx::Size& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation);
|
|
|
| - IntSize m_ioSurfaceSize;
|
| + gfx::Size m_ioSurfaceSize;
|
| unsigned m_ioSurfaceTextureId;
|
| Orientation m_orientation;
|
| };
|
|
|