| 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 eb4aa205d9e80420035937f5b0e06f20931665fd..1bbf8a4e3ddc740e942e10a781dd5e6371a7330e 100644
|
| --- a/cc/quads/io_surface_draw_quad.cc
|
| +++ b/cc/quads/io_surface_draw_quad.cc
|
| @@ -9,7 +9,7 @@
|
| namespace cc {
|
|
|
| IOSurfaceDrawQuad::IOSurfaceDrawQuad()
|
| - : io_surface_texture_id(0),
|
| + : io_surface_resource_id(0),
|
| orientation(FLIPPED) {
|
| }
|
|
|
| @@ -21,14 +21,14 @@ void IOSurfaceDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
|
| gfx::Rect rect,
|
| gfx::Rect opaque_rect,
|
| gfx::Size io_surface_size,
|
| - unsigned io_surface_texture_id,
|
| + unsigned io_surface_resource_id,
|
| Orientation orientation) {
|
| gfx::Rect visible_rect = rect;
|
| bool needs_blending = false;
|
| 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_texture_id = io_surface_texture_id;
|
| + this->io_surface_resource_id = io_surface_resource_id;
|
| this->orientation = orientation;
|
| }
|
|
|
| @@ -38,19 +38,18 @@ void IOSurfaceDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
|
| gfx::Rect visible_rect,
|
| bool needs_blending,
|
| gfx::Size io_surface_size,
|
| - unsigned io_surface_texture_id,
|
| + unsigned io_surface_resource_id,
|
| Orientation orientation) {
|
| 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_texture_id = io_surface_texture_id;
|
| + this->io_surface_resource_id = io_surface_resource_id;
|
| this->orientation = orientation;
|
| }
|
|
|
| void IOSurfaceDrawQuad::IterateResources(
|
| const ResourceIteratorCallback& callback) {
|
| - // TODO(danakj): Convert to TextureDrawQuad?
|
| - NOTIMPLEMENTED();
|
| + io_surface_resource_id = callback.Run(io_surface_resource_id);
|
| }
|
|
|
| const IOSurfaceDrawQuad* IOSurfaceDrawQuad::MaterialCast(
|
|
|