| Index: cc/quads/stream_video_draw_quad.cc
|
| diff --git a/cc/quads/stream_video_draw_quad.cc b/cc/quads/stream_video_draw_quad.cc
|
| index 89e40031b73d822520bc04d200fc7bda2585d8f7..831304f1a0800a50a32aa94619cee717c6be0451 100644
|
| --- a/cc/quads/stream_video_draw_quad.cc
|
| +++ b/cc/quads/stream_video_draw_quad.cc
|
| @@ -8,7 +8,7 @@
|
|
|
| namespace cc {
|
|
|
| -StreamVideoDrawQuad::StreamVideoDrawQuad() : texture_id(0) {}
|
| +StreamVideoDrawQuad::StreamVideoDrawQuad() : resource_id(0) {}
|
|
|
| scoped_ptr<StreamVideoDrawQuad> StreamVideoDrawQuad::Create() {
|
| return make_scoped_ptr(new StreamVideoDrawQuad);
|
| @@ -17,13 +17,13 @@ scoped_ptr<StreamVideoDrawQuad> StreamVideoDrawQuad::Create() {
|
| void StreamVideoDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
|
| gfx::Rect rect,
|
| gfx::Rect opaque_rect,
|
| - unsigned texture_id,
|
| + unsigned resource_id,
|
| const gfx::Transform& matrix) {
|
| gfx::Rect visible_rect = rect;
|
| bool needs_blending = false;
|
| DrawQuad::SetAll(shared_quad_state, DrawQuad::STREAM_VIDEO_CONTENT, rect,
|
| opaque_rect, visible_rect, needs_blending);
|
| - this->texture_id = texture_id;
|
| + this->resource_id = resource_id;
|
| this->matrix = matrix;
|
| }
|
|
|
| @@ -32,18 +32,17 @@ void StreamVideoDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
|
| gfx::Rect opaque_rect,
|
| gfx::Rect visible_rect,
|
| bool needs_blending,
|
| - unsigned texture_id,
|
| + unsigned resource_id,
|
| const gfx::Transform& matrix) {
|
| DrawQuad::SetAll(shared_quad_state, DrawQuad::STREAM_VIDEO_CONTENT, rect,
|
| opaque_rect, visible_rect, needs_blending);
|
| - this->texture_id = texture_id;
|
| + this->resource_id = resource_id;
|
| this->matrix = matrix;
|
| }
|
|
|
| void StreamVideoDrawQuad::IterateResources(
|
| const ResourceIteratorCallback& callback) {
|
| - // TODO(danakj): Convert to TextureDrawQuad?
|
| - NOTIMPLEMENTED();
|
| + resource_id = callback.Run(resource_id);
|
| }
|
|
|
| const StreamVideoDrawQuad* StreamVideoDrawQuad::MaterialCast(
|
|
|