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

Unified Diff: cc/test/render_pass_test_common.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/test/fake_ui_resource_layer_tree_host_impl.cc ('k') | cc/test/render_pass_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/render_pass_test_common.cc
diff --git a/cc/test/render_pass_test_common.cc b/cc/test/render_pass_test_common.cc
index 6895297cacafd278e40893b0e5c9d9ca95f2d6f1..3789efc7d7973ac685ed8d56b3cf72e4d66f83ab 100644
--- a/cc/test/render_pass_test_common.cc
+++ b/cc/test/render_pass_test_common.cc
@@ -34,38 +34,38 @@ void TestRenderPass::AppendOneOfEveryQuadType(
gfx::Rect visible_rect(0, 0, 100, 100);
const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
- ResourceProvider::ResourceId resource1 = resource_provider->CreateResource(
+ ResourceId resource1 = resource_provider->CreateResource(
gfx::Size(45, 5), GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider->best_texture_format());
resource_provider->AllocateForTesting(resource1);
- ResourceProvider::ResourceId resource2 = resource_provider->CreateResource(
+ ResourceId resource2 = resource_provider->CreateResource(
gfx::Size(346, 61), GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider->best_texture_format());
resource_provider->AllocateForTesting(resource2);
- ResourceProvider::ResourceId resource3 = resource_provider->CreateResource(
+ ResourceId resource3 = resource_provider->CreateResource(
gfx::Size(12, 134), GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider->best_texture_format());
resource_provider->AllocateForTesting(resource3);
- ResourceProvider::ResourceId resource4 = resource_provider->CreateResource(
+ ResourceId resource4 = resource_provider->CreateResource(
gfx::Size(56, 12), GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider->best_texture_format());
resource_provider->AllocateForTesting(resource4);
gfx::Size resource5_size(73, 26);
- ResourceProvider::ResourceId resource5 = resource_provider->CreateResource(
+ ResourceId resource5 = resource_provider->CreateResource(
resource5_size, GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider->best_texture_format());
resource_provider->AllocateForTesting(resource5);
- ResourceProvider::ResourceId resource6 = resource_provider->CreateResource(
+ ResourceId resource6 = resource_provider->CreateResource(
gfx::Size(64, 92), GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider->best_texture_format());
resource_provider->AllocateForTesting(resource6);
- ResourceProvider::ResourceId resource7 = resource_provider->CreateResource(
+ ResourceId resource7 = resource_provider->CreateResource(
gfx::Size(9, 14), GL_CLAMP_TO_EDGE,
ResourceProvider::TEXTURE_HINT_IMMUTABLE,
resource_provider->best_texture_format());
@@ -77,9 +77,8 @@ void TestRenderPass::AppendOneOfEveryQuadType(
scoped_ptr<SingleReleaseCallbackImpl> callback =
SingleReleaseCallbackImpl::Create(base::Bind(&EmptyReleaseCallback));
TextureMailbox mailbox(gpu_mailbox, target, kSyncPointForMailboxTextureQuad);
- ResourceProvider::ResourceId resource8 =
- resource_provider->CreateResourceFromTextureMailbox(mailbox,
- callback.Pass());
+ ResourceId resource8 = resource_provider->CreateResourceFromTextureMailbox(
+ mailbox, callback.Pass());
resource_provider->AllocateForTesting(resource8);
SharedQuadState* shared_state = this->CreateAndAppendSharedQuadState();
@@ -233,7 +232,7 @@ void TestRenderPass::AppendOneOfEveryQuadType(
false,
false);
- ResourceProvider::ResourceId plane_resources[4];
+ ResourceId plane_resources[4];
for (int i = 0; i < 4; ++i) {
plane_resources[i] = resource_provider->CreateResource(
gfx::Size(20, 12), GL_CLAMP_TO_EDGE,
« no previous file with comments | « cc/test/fake_ui_resource_layer_tree_host_impl.cc ('k') | cc/test/render_pass_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698