| Index: cc/output/gl_renderer.cc
|
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
|
| index bdb537aa6627d34d7be142c772419ce6ce5fe301..04572db97f49e2c1f49048d2a813f58985ea498b 100644
|
| --- a/cc/output/gl_renderer.cc
|
| +++ b/cc/output/gl_renderer.cc
|
| @@ -446,9 +446,8 @@ void GLRenderer::ClearFramebuffer(DrawingFrame* frame) {
|
| }
|
| }
|
|
|
| -static ResourceProvider::ResourceId WaitOnResourceSyncPoints(
|
| - ResourceProvider* resource_provider,
|
| - ResourceProvider::ResourceId resource_id) {
|
| +static ResourceId WaitOnResourceSyncPoints(ResourceProvider* resource_provider,
|
| + ResourceId resource_id) {
|
| resource_provider->WaitSyncPointIfNeeded(resource_id);
|
| return resource_id;
|
| }
|
| @@ -1635,7 +1634,7 @@ void GLRenderer::DrawTileQuad(const DrawingFrame* frame,
|
|
|
| void GLRenderer::DrawContentQuad(const DrawingFrame* frame,
|
| const ContentDrawQuadBase* quad,
|
| - ResourceProvider::ResourceId resource_id,
|
| + ResourceId resource_id,
|
| const gfx::QuadF* clip_region) {
|
| gfx::Transform device_transform =
|
| frame->window_matrix * frame->projection_matrix * quad->quadTransform();
|
| @@ -1655,7 +1654,7 @@ void GLRenderer::DrawContentQuad(const DrawingFrame* frame,
|
|
|
| void GLRenderer::DrawContentQuadAA(const DrawingFrame* frame,
|
| const ContentDrawQuadBase* quad,
|
| - ResourceProvider::ResourceId resource_id,
|
| + ResourceId resource_id,
|
| const gfx::Transform& device_transform,
|
| const gfx::QuadF* clip_region) {
|
| if (!device_transform.IsInvertible())
|
| @@ -1775,7 +1774,7 @@ void GLRenderer::DrawContentQuadAA(const DrawingFrame* frame,
|
|
|
| void GLRenderer::DrawContentQuadNoAA(const DrawingFrame* frame,
|
| const ContentDrawQuadBase* quad,
|
| - ResourceProvider::ResourceId resource_id,
|
| + ResourceId resource_id,
|
| const gfx::QuadF* clip_region) {
|
| gfx::RectF tex_coord_rect = MathUtil::ScaleRectProportional(
|
| quad->tex_coord_rect, quad->rect, quad->visible_rect);
|
|
|