| Index: cc/stream_video_draw_quad.cc
|
| diff --git a/cc/stream_video_draw_quad.cc b/cc/stream_video_draw_quad.cc
|
| index e92d98a390fe137e8b32ae271029f772ffc00236..2e3a1c8270af61d1564ba14e127c4c3d6a865e5b 100644
|
| --- a/cc/stream_video_draw_quad.cc
|
| +++ b/cc/stream_video_draw_quad.cc
|
| @@ -8,22 +8,22 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<CCStreamVideoDrawQuad> CCStreamVideoDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned textureId, const WebKit::WebTransformationMatrix& matrix)
|
| +scoped_ptr<StreamVideoDrawQuad> StreamVideoDrawQuad::create(const SharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned textureId, const WebKit::WebTransformationMatrix& matrix)
|
| {
|
| - return make_scoped_ptr(new CCStreamVideoDrawQuad(sharedQuadState, quadRect, textureId, matrix));
|
| + return make_scoped_ptr(new StreamVideoDrawQuad(sharedQuadState, quadRect, textureId, matrix));
|
| }
|
|
|
| -CCStreamVideoDrawQuad::CCStreamVideoDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned textureId, const WebKit::WebTransformationMatrix& matrix)
|
| - : CCDrawQuad(sharedQuadState, CCDrawQuad::StreamVideoContent, quadRect)
|
| +StreamVideoDrawQuad::StreamVideoDrawQuad(const SharedQuadState* sharedQuadState, const IntRect& quadRect, unsigned textureId, const WebKit::WebTransformationMatrix& matrix)
|
| + : DrawQuad(sharedQuadState, DrawQuad::StreamVideoContent, quadRect)
|
| , m_textureId(textureId)
|
| , m_matrix(matrix)
|
| {
|
| }
|
|
|
| -const CCStreamVideoDrawQuad* CCStreamVideoDrawQuad::materialCast(const CCDrawQuad* quad)
|
| +const StreamVideoDrawQuad* StreamVideoDrawQuad::materialCast(const DrawQuad* quad)
|
| {
|
| - ASSERT(quad->material() == CCDrawQuad::StreamVideoContent);
|
| - return static_cast<const CCStreamVideoDrawQuad*>(quad);
|
| + ASSERT(quad->material() == DrawQuad::StreamVideoContent);
|
| + return static_cast<const StreamVideoDrawQuad*>(quad);
|
| }
|
|
|
| } // namespace cc
|
|
|