| Index: cc/tile_draw_quad.cc
|
| diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc
|
| index a5ac33dbeb04af8f274d30c6ca3339fbbd6c8cf1..6c14dc80de45ba3d60c09813dbc0c6c6af631b8c 100644
|
| --- a/cc/tile_draw_quad.cc
|
| +++ b/cc/tile_draw_quad.cc
|
| @@ -8,13 +8,13 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<CCTileDrawQuad> CCTileDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
|
| +scoped_ptr<TileDrawQuad> TileDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
|
| {
|
| - return make_scoped_ptr(new CCTileDrawQuad(sharedQuadState, quadRect, opaqueRect, resourceId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA));
|
| + return make_scoped_ptr(new TileDrawQuad(sharedQuadState, quadRect, opaqueRect, resourceId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA));
|
| }
|
|
|
| -CCTileDrawQuad::CCTileDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
|
| - : CCDrawQuad(sharedQuadState, CCDrawQuad::TiledContent, quadRect)
|
| +TileDrawQuad::TileDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GC3Dint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
|
| + : DrawQuad(sharedQuadState, DrawQuad::TiledContent, quadRect)
|
| , m_resourceId(resourceId)
|
| , m_textureOffset(textureOffset)
|
| , m_textureSize(textureSize)
|
| @@ -30,10 +30,10 @@ CCTileDrawQuad::CCTileDrawQuad(const CCSharedQuadState* sharedQuadState, const I
|
| m_opaqueRect = opaqueRect;
|
| }
|
|
|
| -const CCTileDrawQuad* CCTileDrawQuad::materialCast(const CCDrawQuad* quad)
|
| +const TileDrawQuad* TileDrawQuad::materialCast(const DrawQuad* quad)
|
| {
|
| - ASSERT(quad->material() == CCDrawQuad::TiledContent);
|
| - return static_cast<const CCTileDrawQuad*>(quad);
|
| + ASSERT(quad->material() == DrawQuad::TiledContent);
|
| + return static_cast<const TileDrawQuad*>(quad);
|
| }
|
|
|
| }
|
|
|