| Index: cc/solid_color_draw_quad.cc
|
| diff --git a/cc/solid_color_draw_quad.cc b/cc/solid_color_draw_quad.cc
|
| index 157acd9d3b443f231fbbb278f31900a2f0ee3664..9963b516d33dc71eb2188a9f31f13bac75b55055 100644
|
| --- a/cc/solid_color_draw_quad.cc
|
| +++ b/cc/solid_color_draw_quad.cc
|
| @@ -8,13 +8,13 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<CCSolidColorDrawQuad> CCSolidColorDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color)
|
| +scoped_ptr<SolidColorDrawQuad> SolidColorDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color)
|
| {
|
| - return make_scoped_ptr(new CCSolidColorDrawQuad(sharedQuadState, quadRect, color));
|
| + return make_scoped_ptr(new SolidColorDrawQuad(sharedQuadState, quadRect, color));
|
| }
|
|
|
| -CCSolidColorDrawQuad::CCSolidColorDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color)
|
| - : CCDrawQuad(sharedQuadState, CCDrawQuad::SolidColor, quadRect)
|
| +SolidColorDrawQuad::SolidColorDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color)
|
| + : DrawQuad(sharedQuadState, DrawQuad::SolidColor, quadRect)
|
| , m_color(color)
|
| {
|
| if (SkColorGetA(m_color) < 255)
|
| @@ -23,10 +23,10 @@ CCSolidColorDrawQuad::CCSolidColorDrawQuad(const CCSharedQuadState* sharedQuadSt
|
| m_opaqueRect = quadRect;
|
| }
|
|
|
| -const CCSolidColorDrawQuad* CCSolidColorDrawQuad::materialCast(const CCDrawQuad* quad)
|
| +const SolidColorDrawQuad* SolidColorDrawQuad::materialCast(const DrawQuad* quad)
|
| {
|
| - ASSERT(quad->material() == CCDrawQuad::SolidColor);
|
| - return static_cast<const CCSolidColorDrawQuad*>(quad);
|
| + ASSERT(quad->material() == DrawQuad::SolidColor);
|
| + return static_cast<const SolidColorDrawQuad*>(quad);
|
| }
|
|
|
| } // namespacec cc
|
|
|