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

Unified Diff: cc/resource_update_controller_unittest.cc

Issue 11369109: cc: Rename PrioritizedTexture to PrioritizedResource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/resource_update_controller.cc ('k') | cc/resource_update_queue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_update_controller_unittest.cc
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
index 7d6862914945f9b5a286b066194cd14dadb96153..cf58a1105fb7cac151483ab5d96fa37331dfc9b2 100644
--- a/cc/resource_update_controller_unittest.cc
+++ b/cc/resource_update_controller_unittest.cc
@@ -65,7 +65,7 @@ class ResourceUpdateControllerTest : public Test {
public:
ResourceUpdateControllerTest()
: m_queue(make_scoped_ptr(new ResourceUpdateQueue))
- , m_textureManager(PrioritizedTextureManager::create(60*1024*1024, 1024, Renderer::ContentPool))
+ , m_resourceManager(PrioritizedResourceManager::create(60*1024*1024, 1024, Renderer::ContentPool))
, m_fullUploadCountExpected(0)
, m_partialCountExpected(0)
, m_totalUploadCountExpected(0)
@@ -82,7 +82,7 @@ public:
{
DebugScopedSetImplThreadAndMainThreadBlocked
implThreadAndMainThreadBlocked;
- m_textureManager->clearAllMemory(m_resourceProvider.get());
+ m_resourceManager->clearAllMemory(m_resourceProvider.get());
}
public:
@@ -126,12 +126,12 @@ protected:
m_bitmap.allocPixels();
for (int i = 0; i < 4; i++) {
- m_textures[i] = PrioritizedTexture::create(
- m_textureManager.get(), gfx::Size(300, 150), GL_RGBA);
+ m_textures[i] = PrioritizedResource::create(
+ m_resourceManager.get(), gfx::Size(300, 150), GL_RGBA);
m_textures[i]->setRequestPriority(
PriorityCalculator::visiblePriority(true));
}
- m_textureManager->prioritizeTextures();
+ m_resourceManager->prioritizeTextures();
DebugScopedSetImplThread implThread;
m_resourceProvider = ResourceProvider::create(m_context.get());
@@ -200,8 +200,8 @@ protected:
scoped_ptr<GraphicsContext> m_context;
scoped_ptr<ResourceProvider> m_resourceProvider;
scoped_ptr<ResourceUpdateQueue> m_queue;
- scoped_ptr<PrioritizedTexture> m_textures[4];
- scoped_ptr<PrioritizedTextureManager> m_textureManager;
+ scoped_ptr<PrioritizedResource> m_textures[4];
+ scoped_ptr<PrioritizedResourceManager> m_resourceManager;
SkBitmap m_bitmap;
int m_queryResultsAvailable;
« no previous file with comments | « cc/resource_update_controller.cc ('k') | cc/resource_update_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698