| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index 324a7bd16e4d7bd82d3afbf6d4659f3d820dcf6f..cba064290afe70d404f64d13097da1974d0deb62 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -198,16 +198,16 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| const gfx::QuadF* clip_region);
|
| void DrawContentQuad(const DrawingFrame* frame,
|
| const ContentDrawQuadBase* quad,
|
| - ResourceProvider::ResourceId resource_id,
|
| + ResourceId resource_id,
|
| const gfx::QuadF* clip_region);
|
| void DrawContentQuadAA(const DrawingFrame* frame,
|
| const ContentDrawQuadBase* quad,
|
| - ResourceProvider::ResourceId resource_id,
|
| + ResourceId resource_id,
|
| const gfx::Transform& device_transform,
|
| const gfx::QuadF* clip_region);
|
| void DrawContentQuadNoAA(const DrawingFrame* frame,
|
| const ContentDrawQuadBase* quad,
|
| - ResourceProvider::ResourceId resource_id,
|
| + ResourceId resource_id,
|
| const gfx::QuadF* clip_region);
|
| void DrawYUVVideoQuad(const DrawingFrame* frame,
|
| const YUVVideoDrawQuad* quad,
|
| @@ -515,7 +515,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| bool use_blend_equation_advanced_coherent_;
|
|
|
| SkBitmap on_demand_tile_raster_bitmap_;
|
| - ResourceProvider::ResourceId on_demand_tile_raster_resource_id_;
|
| + ResourceId on_demand_tile_raster_resource_id_;
|
| BoundGeometry bound_geometry_;
|
| DISALLOW_COPY_AND_ASSIGN(GLRenderer);
|
| };
|
|
|