Index: cc/quads/io_surface_draw_quad.cc |
diff --git a/cc/quads/io_surface_draw_quad.cc b/cc/quads/io_surface_draw_quad.cc |
index 8a37b0a6f068d5ca2c7f77d3d681ba256abf6a9a..0ad70fcc6b8a6fe064111e42e15a4409b64c30eb 100644 |
--- a/cc/quads/io_surface_draw_quad.cc |
+++ b/cc/quads/io_surface_draw_quad.cc |
@@ -11,9 +11,7 @@ |
namespace cc { |
-IOSurfaceDrawQuad::IOSurfaceDrawQuad() |
- : io_surface_resource_id(0), |
- orientation(FLIPPED) { |
+IOSurfaceDrawQuad::IOSurfaceDrawQuad() : orientation(FLIPPED) { |
} |
void IOSurfaceDrawQuad::SetNew(const SharedQuadState* shared_quad_state, |
@@ -27,7 +25,8 @@ void IOSurfaceDrawQuad::SetNew(const SharedQuadState* shared_quad_state, |
DrawQuad::SetAll(shared_quad_state, DrawQuad::IO_SURFACE_CONTENT, rect, |
opaque_rect, visible_rect, needs_blending); |
this->io_surface_size = io_surface_size; |
- this->io_surface_resource_id = io_surface_resource_id; |
+ resources.ids[kIOSurfaceResourceIdIndex] = io_surface_resource_id; |
+ resources.count = 1; |
this->orientation = orientation; |
} |
@@ -42,15 +41,11 @@ void IOSurfaceDrawQuad::SetAll(const SharedQuadState* shared_quad_state, |
DrawQuad::SetAll(shared_quad_state, DrawQuad::IO_SURFACE_CONTENT, rect, |
opaque_rect, visible_rect, needs_blending); |
this->io_surface_size = io_surface_size; |
- this->io_surface_resource_id = io_surface_resource_id; |
+ resources.ids[kIOSurfaceResourceIdIndex] = io_surface_resource_id; |
+ resources.count = 1; |
this->orientation = orientation; |
} |
-void IOSurfaceDrawQuad::IterateResources( |
- const ResourceIteratorCallback& callback) { |
- io_surface_resource_id = callback.Run(io_surface_resource_id); |
-} |
- |
const IOSurfaceDrawQuad* IOSurfaceDrawQuad::MaterialCast( |
const DrawQuad* quad) { |
DCHECK(quad->material == DrawQuad::IO_SURFACE_CONTENT); |
@@ -61,7 +56,8 @@ void IOSurfaceDrawQuad::ExtendValue( |
base::trace_event::TracedValue* value) const { |
MathUtil::AddToTracedValue("io_surface_size", io_surface_size, value); |
- value->SetInteger("io_surface_resource_id", io_surface_resource_id); |
+ value->SetInteger("io_surface_resource_id", |
+ resources.ids[kIOSurfaceResourceIdIndex]); |
const char* orientation_string = NULL; |
switch (orientation) { |
case FLIPPED: |