diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
| commit | c753e25a8b4366c44134a8c21b9ed3392bf48608 (patch) | |
| tree | f378c8a762caccf60856a1670ae33dfd638b9453 /cc/texture_draw_quad.cc | |
| parent | 503160f80568f024fa712e280bb1a4e1e6ca1ec3 (diff) | |
| download | chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.zip chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.gz chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.bz2 | |
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
Diffstat (limited to 'cc/texture_draw_quad.cc')
| -rw-r--r-- | cc/texture_draw_quad.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc index 5a45c78..5be8545 100644 --- a/cc/texture_draw_quad.cc +++ b/cc/texture_draw_quad.cc @@ -10,13 +10,13 @@ namespace cc { -scoped_ptr<TextureDrawQuad> TextureDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) +scoped_ptr<CCTextureDrawQuad> CCTextureDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) { - return make_scoped_ptr(new TextureDrawQuad(sharedQuadState, quadRect, resourceId, premultipliedAlpha, uvRect, flipped)); + return make_scoped_ptr(new CCTextureDrawQuad(sharedQuadState, quadRect, resourceId, premultipliedAlpha, uvRect, flipped)); } -TextureDrawQuad::TextureDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) - : DrawQuad(sharedQuadState, DrawQuad::TextureContent, quadRect) +CCTextureDrawQuad::CCTextureDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned resourceId, bool premultipliedAlpha, const FloatRect& uvRect, bool flipped) + : CCDrawQuad(sharedQuadState, CCDrawQuad::TextureContent, quadRect) , m_resourceId(resourceId) , m_premultipliedAlpha(premultipliedAlpha) , m_uvRect(uvRect) @@ -24,15 +24,15 @@ TextureDrawQuad::TextureDrawQuad(const SharedQuadState* sharedQuadState, const I { } -void TextureDrawQuad::setNeedsBlending() +void CCTextureDrawQuad::setNeedsBlending() { m_needsBlending = true; } -const TextureDrawQuad* TextureDrawQuad::materialCast(const DrawQuad* quad) +const CCTextureDrawQuad* CCTextureDrawQuad::materialCast(const CCDrawQuad* quad) { - DCHECK(quad->material() == DrawQuad::TextureContent); - return static_cast<const TextureDrawQuad*>(quad); + DCHECK(quad->material() == CCDrawQuad::TextureContent); + return static_cast<const CCTextureDrawQuad*>(quad); } } |