| 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 fb6f728ee2ebaae4c771c66de6763e468b106b2f..3ab992867ca955e3c0f3f7ba434a3030cef8feaf 100644
|
| --- a/cc/quads/stream_video_draw_quad.cc
|
| +++ b/cc/quads/stream_video_draw_quad.cc
|
| @@ -11,7 +11,8 @@
|
|
|
| namespace cc {
|
|
|
| -StreamVideoDrawQuad::StreamVideoDrawQuad() : resource_id(0) {}
|
| +StreamVideoDrawQuad::StreamVideoDrawQuad() {
|
| +}
|
|
|
| void StreamVideoDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
|
| const gfx::Rect& rect,
|
| @@ -22,7 +23,8 @@ void StreamVideoDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
|
| bool needs_blending = false;
|
| DrawQuad::SetAll(shared_quad_state, DrawQuad::STREAM_VIDEO_CONTENT, rect,
|
| opaque_rect, visible_rect, needs_blending);
|
| - this->resource_id = resource_id;
|
| + resources.ids[kResourceIdIndex] = resource_id;
|
| + resources.count = 1;
|
| this->matrix = matrix;
|
| }
|
|
|
| @@ -35,15 +37,11 @@ void StreamVideoDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
|
| const gfx::Transform& matrix) {
|
| DrawQuad::SetAll(shared_quad_state, DrawQuad::STREAM_VIDEO_CONTENT, rect,
|
| opaque_rect, visible_rect, needs_blending);
|
| - this->resource_id = resource_id;
|
| + resources.ids[kResourceIdIndex] = resource_id;
|
| + resources.count = 1;
|
| this->matrix = matrix;
|
| }
|
|
|
| -void StreamVideoDrawQuad::IterateResources(
|
| - const ResourceIteratorCallback& callback) {
|
| - resource_id = callback.Run(resource_id);
|
| -}
|
| -
|
| const StreamVideoDrawQuad* StreamVideoDrawQuad::MaterialCast(
|
| const DrawQuad* quad) {
|
| DCHECK(quad->material == DrawQuad::STREAM_VIDEO_CONTENT);
|
| @@ -52,7 +50,7 @@ const StreamVideoDrawQuad* StreamVideoDrawQuad::MaterialCast(
|
|
|
| void StreamVideoDrawQuad::ExtendValue(
|
| base::trace_event::TracedValue* value) const {
|
| - value->SetInteger("resource_id", resource_id);
|
| + value->SetInteger("resource_id", resources.ids[kResourceIdIndex]);
|
| MathUtil::AddToTracedValue("matrix", matrix, value);
|
| }
|
|
|
|
|