| Index: cc/io_surface_draw_quad.cc
|
| diff --git a/cc/io_surface_draw_quad.cc b/cc/io_surface_draw_quad.cc
|
| index 5d500433c3d35db7ca8032d48d2a36ef58b92773..0587151bbfab7c65cf9ecf83ce7baaf2f94e7e71 100644
|
| --- a/cc/io_surface_draw_quad.cc
|
| +++ b/cc/io_surface_draw_quad.cc
|
| @@ -8,23 +8,23 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<CCIOSurfaceDrawQuad> CCIOSurfaceDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntSize& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation orientation)
|
| +scoped_ptr<IOSurfaceDrawQuad> IOSurfaceDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, const IntSize& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation orientation)
|
| {
|
| - return make_scoped_ptr(new CCIOSurfaceDrawQuad(sharedQuadState, quadRect, ioSurfaceSize, ioSurfaceTextureId, orientation));
|
| + return make_scoped_ptr(new IOSurfaceDrawQuad(sharedQuadState, quadRect, ioSurfaceSize, ioSurfaceTextureId, orientation));
|
| }
|
|
|
| -CCIOSurfaceDrawQuad::CCIOSurfaceDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, const IntSize& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation orientation)
|
| - : CCDrawQuad(sharedQuadState, CCDrawQuad::IOSurfaceContent, quadRect)
|
| +IOSurfaceDrawQuad::IOSurfaceDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, const IntSize& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation orientation)
|
| + : DrawQuad(sharedQuadState, DrawQuad::IOSurfaceContent, quadRect)
|
| , m_ioSurfaceSize(ioSurfaceSize)
|
| , m_ioSurfaceTextureId(ioSurfaceTextureId)
|
| , m_orientation(orientation)
|
| {
|
| }
|
|
|
| -const CCIOSurfaceDrawQuad* CCIOSurfaceDrawQuad::materialCast(const CCDrawQuad* quad)
|
| +const IOSurfaceDrawQuad* IOSurfaceDrawQuad::materialCast(const DrawQuad* quad)
|
| {
|
| - ASSERT(quad->material() == CCDrawQuad::IOSurfaceContent);
|
| - return static_cast<const CCIOSurfaceDrawQuad*>(quad);
|
| + ASSERT(quad->material() == DrawQuad::IOSurfaceContent);
|
| + return static_cast<const IOSurfaceDrawQuad*>(quad);
|
| }
|
|
|
| } // namespace cc
|
|
|