Index: cc/texture_draw_quad.cc |
diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc |
index db985ad53ff09b0ccd4658bccd92c017a7c3b746..717dd55a5b7ef2900144db8ef05ddcd8e2155f18 100644 |
--- a/cc/texture_draw_quad.cc |
+++ b/cc/texture_draw_quad.cc |
@@ -8,13 +8,13 @@ |
namespace cc { |
-scoped_ptr<CCTextureDrawQuad> CCTextureDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) |
+scoped_ptr<TextureDrawQuad> TextureDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) |
{ |
- return make_scoped_ptr(new CCTextureDrawQuad(sharedQuadState, quadRect, resourceId, premultipliedAlpha, uvRect, flipped)); |
+ return make_scoped_ptr(new TextureDrawQuad(sharedQuadState, quadRect, resourceId, premultipliedAlpha, uvRect, flipped)); |
} |
-CCTextureDrawQuad::CCTextureDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) |
- : CCDrawQuad(sharedQuadState, CCDrawQuad::TextureContent, quadRect) |
+TextureDrawQuad::TextureDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) |
+ : DrawQuad(sharedQuadState, DrawQuad::TextureContent, quadRect) |
, m_resourceId(resourceId) |
, m_premultipliedAlpha(premultipliedAlpha) |
, m_uvRect(uvRect) |
@@ -22,15 +22,15 @@ CCTextureDrawQuad::CCTextureDrawQuad(const CCSharedQuadState* sharedQuadState, c |
{ |
} |
-void CCTextureDrawQuad::setNeedsBlending() |
+void TextureDrawQuad::setNeedsBlending() |
{ |
m_needsBlending = true; |
} |
-const CCTextureDrawQuad* CCTextureDrawQuad::materialCast(const CCDrawQuad* quad) |
+const TextureDrawQuad* TextureDrawQuad::materialCast(const DrawQuad* quad) |
{ |
- ASSERT(quad->material() == CCDrawQuad::TextureContent); |
- return static_cast<const CCTextureDrawQuad*>(quad); |
+ ASSERT(quad->material() == DrawQuad::TextureContent); |
+ return static_cast<const TextureDrawQuad*>(quad); |
} |
} |