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

Unified Diff: cc/output/gl_renderer_unittest.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.cc ('k') | cc/output/overlay_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 09407f55ed78192066ed9f2d3f993d848b1ac935..31e392c148d40609e62ff6f81d4808448e49ea51 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -1558,7 +1558,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
RenderPassId root_pass_id(1, 0);
TestRenderPass* root_pass;
- ResourceProvider::ResourceId mask = resource_provider_->CreateResource(
+ ResourceId mask = resource_provider_->CreateResource(
gfx::Size(20, 12), GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider_->best_texture_format());
@@ -2169,9 +2169,8 @@ TEST_F(GLRendererTest, DontOverlayWithCopyRequests) {
mailbox.set_allow_overlay(true);
scoped_ptr<SingleReleaseCallbackImpl> release_callback =
SingleReleaseCallbackImpl::Create(base::Bind(&MailboxReleased));
- ResourceProvider::ResourceId resource_id =
- resource_provider->CreateResourceFromTextureMailbox(
- mailbox, release_callback.Pass());
+ ResourceId resource_id = resource_provider->CreateResourceFromTextureMailbox(
+ mailbox, release_callback.Pass());
bool premultiplied_alpha = false;
bool flipped = false;
bool nearest_neighbor = false;
@@ -2296,9 +2295,8 @@ TEST_F(GLRendererTest, OverlaySyncPointsAreProcessed) {
mailbox.set_allow_overlay(true);
scoped_ptr<SingleReleaseCallbackImpl> release_callback =
SingleReleaseCallbackImpl::Create(base::Bind(&MailboxReleased));
- ResourceProvider::ResourceId resource_id =
- resource_provider->CreateResourceFromTextureMailbox(
- mailbox, release_callback.Pass());
+ ResourceId resource_id = resource_provider->CreateResourceFromTextureMailbox(
+ mailbox, release_callback.Pass());
bool premultiplied_alpha = false;
bool flipped = false;
bool nearest_neighbor = false;
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/overlay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698