Index: cc/test/mock_quad_culler.cc |
diff --git a/cc/test/mock_quad_culler.cc b/cc/test/mock_quad_culler.cc |
index 282dddccda12f5cd68d555e25d873c8bf6373054..08b8e3e53d9fae5f3e15566b4dcc2ab8c4dc4c6b 100644 |
--- a/cc/test/mock_quad_culler.cc |
+++ b/cc/test/mock_quad_culler.cc |
@@ -8,23 +8,23 @@ |
namespace cc { |
-MockCCQuadCuller::MockCCQuadCuller() |
+MockQuadCuller::MockQuadCuller() |
: m_activeQuadList(m_quadListStorage) |
, m_activeSharedQuadStateList(m_sharedQuadStateStorage) |
{ |
} |
-MockCCQuadCuller::MockCCQuadCuller(CCQuadList& externalQuadList, CCSharedQuadStateList& externalSharedQuadStateList) |
+MockQuadCuller::MockQuadCuller(QuadList& externalQuadList, SharedQuadStateList& externalSharedQuadStateList) |
: m_activeQuadList(externalQuadList) |
, m_activeSharedQuadStateList(externalSharedQuadStateList) |
{ |
} |
-MockCCQuadCuller::~MockCCQuadCuller() |
+MockQuadCuller::~MockQuadCuller() |
{ |
} |
-bool MockCCQuadCuller::append(scoped_ptr<CCDrawQuad> drawQuad, CCAppendQuadsData&) |
+bool MockQuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData&) |
{ |
if (!drawQuad->quadRect().isEmpty()) { |
m_activeQuadList.append(drawQuad.Pass()); |
@@ -33,11 +33,11 @@ bool MockCCQuadCuller::append(scoped_ptr<CCDrawQuad> drawQuad, CCAppendQuadsData |
return false; |
} |
-CCSharedQuadState* MockCCQuadCuller::useSharedQuadState(scoped_ptr<CCSharedQuadState> sharedQuadState) |
+SharedQuadState* MockQuadCuller::useSharedQuadState(scoped_ptr<SharedQuadState> sharedQuadState) |
{ |
sharedQuadState->id = m_activeSharedQuadStateList.size(); |
- CCSharedQuadState* rawPtr = sharedQuadState.get(); |
+ SharedQuadState* rawPtr = sharedQuadState.get(); |
m_activeSharedQuadStateList.append(sharedQuadState.Pass()); |
return rawPtr; |
} |