Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3008)

Unified Diff: cc/output/gl_renderer.cc

Issue 1144523003: Rename cc::ResourceProvider::ResourceId to cc::ResourceId and move it to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 69da9a747542d720251f0571549212a89ce161a6..c695429968234a6efa435bdca50d53067d913b47 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -452,9 +452,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;
}
@@ -1641,7 +1640,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();
@@ -1661,7 +1660,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())
@@ -1781,7 +1780,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);
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698