| Index: cc/tile_draw_quad.h
|
| diff --git a/cc/tile_draw_quad.h b/cc/tile_draw_quad.h
|
| index da02ea607f3a02ce9131defcda0bf51a4b696d31..2e4e89cc7e7bda514683f593f994aad2a977237d 100644
|
| --- a/cc/tile_draw_quad.h
|
| +++ b/cc/tile_draw_quad.h
|
| @@ -17,10 +17,10 @@ namespace cc {
|
|
|
| class TileDrawQuad : public DrawQuad {
|
| public:
|
| - static scoped_ptr<TileDrawQuad> create(const SharedQuadState*, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Point& textureOffset, const gfx::Size& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
| + static scoped_ptr<TileDrawQuad> create(const SharedQuadState*, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Vector2d& textureOffset, const gfx::Size& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
|
|
| unsigned resourceId() const { return m_resourceId; }
|
| - gfx::Point textureOffset() const { return m_textureOffset; }
|
| + gfx::Vector2d textureOffset() const { return m_textureOffset; }
|
| gfx::Size textureSize() const { return m_textureSize; }
|
| GLint textureFilter() const { return m_textureFilter; }
|
| bool swizzleContents() const { return m_swizzleContents; }
|
| @@ -34,10 +34,10 @@ public:
|
|
|
| static const TileDrawQuad* materialCast(const DrawQuad*);
|
| private:
|
| - TileDrawQuad(const SharedQuadState*, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Point& textureOffset, const gfx::Size& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
| + TileDrawQuad(const SharedQuadState*, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Vector2d& textureOffset, const gfx::Size& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
|
|
|
| unsigned m_resourceId;
|
| - gfx::Point m_textureOffset;
|
| + gfx::Vector2d m_textureOffset;
|
| gfx::Size m_textureSize;
|
| GLint m_textureFilter;
|
| bool m_swizzleContents;
|
|
|