| Index: cc/debug_border_draw_quad.cc
|
| diff --git a/cc/debug_border_draw_quad.cc b/cc/debug_border_draw_quad.cc
|
| index aabf9e2928a094601189e653b3102a05963af31a..eedcb053efbd7dba417180f7b709998c214e8167 100644
|
| --- a/cc/debug_border_draw_quad.cc
|
| +++ b/cc/debug_border_draw_quad.cc
|
| @@ -8,13 +8,13 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<CCDebugBorderDrawQuad> CCDebugBorderDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color, int width)
|
| +scoped_ptr<DebugBorderDrawQuad> DebugBorderDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color, int width)
|
| {
|
| - return make_scoped_ptr(new CCDebugBorderDrawQuad(sharedQuadState, quadRect, color, width));
|
| + return make_scoped_ptr(new DebugBorderDrawQuad(sharedQuadState, quadRect, color, width));
|
| }
|
|
|
| -CCDebugBorderDrawQuad::CCDebugBorderDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color, int width)
|
| - : CCDrawQuad(sharedQuadState, CCDrawQuad::DebugBorder, quadRect)
|
| +DebugBorderDrawQuad::DebugBorderDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, SkColor color, int width)
|
| + : DrawQuad(sharedQuadState, DrawQuad::DebugBorder, quadRect)
|
| , m_color(color)
|
| , m_width(width)
|
| {
|
| @@ -23,10 +23,10 @@ CCDebugBorderDrawQuad::CCDebugBorderDrawQuad(const CCSharedQuadState* sharedQuad
|
| m_needsBlending = true;
|
| }
|
|
|
| -const CCDebugBorderDrawQuad* CCDebugBorderDrawQuad::materialCast(const CCDrawQuad* quad)
|
| +const DebugBorderDrawQuad* DebugBorderDrawQuad::materialCast(const DrawQuad* quad)
|
| {
|
| - ASSERT(quad->material() == CCDrawQuad::DebugBorder);
|
| - return static_cast<const CCDebugBorderDrawQuad*>(quad);
|
| + ASSERT(quad->material() == DrawQuad::DebugBorder);
|
| + return static_cast<const DebugBorderDrawQuad*>(quad);
|
| }
|
|
|
| } // namespace cc
|
|
|