| Index: cc/quads/tile_draw_quad.h
|
| diff --git a/cc/quads/tile_draw_quad.h b/cc/quads/tile_draw_quad.h
|
| index 74c36980661354dd75f3f405b3befb7d1e365dc3..f926718e6bf4f895ed6b0bf3992122a7cbb180c3 100644
|
| --- a/cc/quads/tile_draw_quad.h
|
| +++ b/cc/quads/tile_draw_quad.h
|
| @@ -5,47 +5,42 @@
|
| #ifndef CC_QUADS_TILE_DRAW_QUAD_H_
|
| #define CC_QUADS_TILE_DRAW_QUAD_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "cc/base/cc_export.h"
|
| -#include "cc/quads/draw_quad.h"
|
| -#include "third_party/khronos/GLES2/gl2.h"
|
| -#include "ui/gfx/point.h"
|
| -#include "ui/gfx/size.h"
|
| +#include "cc/quads/tile_draw_quad_base.h"
|
|
|
| namespace cc {
|
|
|
| -class CC_EXPORT TileDrawQuad : public DrawQuad {
|
| +class CC_EXPORT TileDrawQuad : public TileDrawQuadBase {
|
| public:
|
| static scoped_ptr<TileDrawQuad> Create();
|
|
|
| void SetNew(const SharedQuadState* shared_quad_state,
|
| - gfx::Rect rect,
|
| - gfx::Rect opaque_rect,
|
| + const gfx::Rect& rect,
|
| + const gfx::Rect& opaque_rect,
|
| unsigned resource_id,
|
| const gfx::RectF& tex_coord_rect,
|
| - gfx::Size texture_size,
|
| + const gfx::Size& texture_size,
|
| bool swizzle_contents);
|
|
|
| void SetAll(const SharedQuadState* shared_quad_state,
|
| - gfx::Rect rect,
|
| - gfx::Rect opaque_rect,
|
| - gfx::Rect visible_rect,
|
| + const gfx::Rect& rect,
|
| + const gfx::Rect& opaque_rect,
|
| + const gfx::Rect& visible_rect,
|
| bool needs_blending,
|
| unsigned resource_id,
|
| const gfx::RectF& tex_coord_rect,
|
| - gfx::Size texture_size,
|
| + const gfx::Size& texture_size,
|
| bool swizzle_contents);
|
|
|
| unsigned resource_id;
|
| - gfx::RectF tex_coord_rect;
|
| - gfx::Size texture_size;
|
| - bool swizzle_contents;
|
|
|
| virtual void IterateResources(const ResourceIteratorCallback& callback)
|
| OVERRIDE;
|
|
|
| static const TileDrawQuad* MaterialCast(const DrawQuad*);
|
| - private:
|
| +
|
| + virtual ~TileDrawQuad();
|
| +
|
| + protected:
|
| TileDrawQuad();
|
| };
|
|
|
|
|