From c753e25a8b4366c44134a8c21b9ed3392bf48608 Mon Sep 17 00:00:00 2001 From: "enne@chromium.org" Date: Fri, 19 Oct 2012 21:22:42 +0000 Subject: Revert "cc: Rename cc classes and members to match filenames" This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/tile_draw_quad.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cc/tile_draw_quad.cc') diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc index 5237400..e50861e 100644 --- a/cc/tile_draw_quad.cc +++ b/cc/tile_draw_quad.cc @@ -11,13 +11,13 @@ namespace cc { -scoped_ptr TileDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA) +scoped_ptr CCTileDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA) { - return make_scoped_ptr(new TileDrawQuad(sharedQuadState, quadRect, opaqueRect, resourceId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA)); + return make_scoped_ptr(new CCTileDrawQuad(sharedQuadState, quadRect, opaqueRect, resourceId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA)); } -TileDrawQuad::TileDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA) - : DrawQuad(sharedQuadState, DrawQuad::TiledContent, quadRect) +CCTileDrawQuad::CCTileDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA) + : CCDrawQuad(sharedQuadState, CCDrawQuad::TiledContent, quadRect) , m_resourceId(resourceId) , m_textureOffset(textureOffset) , m_textureSize(textureSize) @@ -33,10 +33,10 @@ TileDrawQuad::TileDrawQuad(const SharedQuadState* sharedQuadState, const IntRect m_opaqueRect = opaqueRect; } -const TileDrawQuad* TileDrawQuad::materialCast(const DrawQuad* quad) +const CCTileDrawQuad* CCTileDrawQuad::materialCast(const CCDrawQuad* quad) { - DCHECK(quad->material() == DrawQuad::TiledContent); - return static_cast(quad); + DCHECK(quad->material() == CCDrawQuad::TiledContent); + return static_cast(quad); } } -- cgit v1.1