summaryrefslogtreecommitdiffstats
path: root/cc/draw_quad.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 21:22:42 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 21:22:42 +0000
commitc753e25a8b4366c44134a8c21b9ed3392bf48608 (patch)
treef378c8a762caccf60856a1670ae33dfd638b9453 /cc/draw_quad.cc
parent503160f80568f024fa712e280bb1a4e1e6ca1ec3 (diff)
downloadchromium_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/draw_quad.cc')
-rw-r--r--cc/draw_quad.cc34
1 files changed, 17 insertions, 17 deletions
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
index bf63b4a..65d2506 100644
--- a/cc/draw_quad.cc
+++ b/cc/draw_quad.cc
@@ -20,7 +20,7 @@
namespace cc {
-DrawQuad::DrawQuad(const SharedQuadState* sharedQuadState, Material material, const IntRect& quadRect)
+CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material material, const IntRect& quadRect)
: m_sharedQuadState(sharedQuadState)
, m_sharedQuadStateId(sharedQuadState->id)
, m_material(material)
@@ -33,7 +33,7 @@ DrawQuad::DrawQuad(const SharedQuadState* sharedQuadState, Material material, co
DCHECK(m_material != Invalid);
}
-IntRect DrawQuad::opaqueRect() const
+IntRect CCDrawQuad::opaqueRect() const
{
if (opacity() != 1)
return IntRect();
@@ -42,43 +42,43 @@ IntRect DrawQuad::opaqueRect() const
return m_opaqueRect;
}
-void DrawQuad::setQuadVisibleRect(const IntRect& quadVisibleRect)
+void CCDrawQuad::setQuadVisibleRect(const IntRect& quadVisibleRect)
{
IntRect intersection = quadVisibleRect;
intersection.intersect(m_quadRect);
m_quadVisibleRect = intersection;
}
-unsigned DrawQuad::size() const
+unsigned CCDrawQuad::size() const
{
switch (material()) {
case Checkerboard:
- return sizeof(CheckerboardDrawQuad);
+ return sizeof(CCCheckerboardDrawQuad);
case DebugBorder:
- return sizeof(DebugBorderDrawQuad);
+ return sizeof(CCDebugBorderDrawQuad);
case IOSurfaceContent:
- return sizeof(IOSurfaceDrawQuad);
+ return sizeof(CCIOSurfaceDrawQuad);
case TextureContent:
- return sizeof(TextureDrawQuad);
+ return sizeof(CCTextureDrawQuad);
case SolidColor:
- return sizeof(SolidColorDrawQuad);
+ return sizeof(CCSolidColorDrawQuad);
case TiledContent:
- return sizeof(TileDrawQuad);
+ return sizeof(CCTileDrawQuad);
case StreamVideoContent:
- return sizeof(StreamVideoDrawQuad);
+ return sizeof(CCStreamVideoDrawQuad);
case RenderPass:
- return sizeof(RenderPassDrawQuad);
+ return sizeof(CCRenderPassDrawQuad);
case YUVVideoContent:
- return sizeof(YUVVideoDrawQuad);
+ return sizeof(CCYUVVideoDrawQuad);
case Invalid:
break;
}
CRASH();
- return sizeof(DrawQuad);
+ return sizeof(CCDrawQuad);
}
-scoped_ptr<DrawQuad> DrawQuad::copy(const SharedQuadState* copiedSharedQuadState) const
+scoped_ptr<CCDrawQuad> CCDrawQuad::copy(const CCSharedQuadState* copiedSharedQuadState) const
{
// RenderPass quads have their own copy() method.
DCHECK(material() != RenderPass);
@@ -86,14 +86,14 @@ scoped_ptr<DrawQuad> DrawQuad::copy(const SharedQuadState* copiedSharedQuadState
unsigned bytes = size();
DCHECK(bytes > 0);
- scoped_ptr<DrawQuad> copyQuad(reinterpret_cast<DrawQuad*>(new char[bytes]));
+ scoped_ptr<CCDrawQuad> copyQuad(reinterpret_cast<CCDrawQuad*>(new char[bytes]));
memcpy(copyQuad.get(), this, bytes);
copyQuad->setSharedQuadState(copiedSharedQuadState);
return copyQuad.Pass();
}
-void DrawQuad::setSharedQuadState(const SharedQuadState* sharedQuadState)
+void CCDrawQuad::setSharedQuadState(const CCSharedQuadState* sharedQuadState)
{
m_sharedQuadState = sharedQuadState;
m_sharedQuadStateId = sharedQuadState->id;