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

Unified Diff: cc/resource_update_controller_unittest.cc

Issue 11450019: Finish the rename from cc::GraphicsContext to cc::OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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
Index: cc/resource_update_controller_unittest.cc
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
index fad3f26aa46fad51388a809658247c94c1bc19e6..4b324b64fc11dd9ea339112bd73923c4d3d5a591 100644
--- a/cc/resource_update_controller_unittest.cc
+++ b/cc/resource_update_controller_unittest.cc
@@ -121,7 +121,7 @@ public:
protected:
virtual void SetUp()
{
- m_context = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this)));
+ m_outputSurface = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this)));
m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 300, 150);
m_bitmap.allocPixels();
@@ -133,7 +133,7 @@ protected:
}
m_resourceManager->prioritizeTextures();
- m_resourceProvider = ResourceProvider::create(m_context.get());
+ m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
}
@@ -198,7 +198,7 @@ protected:
protected:
// Classes required to interact and test the ResourceUpdateController
FakeProxy m_proxy;
- scoped_ptr<GraphicsContext> m_context;
+ scoped_ptr<OutputSurface> m_outputSurface;
scoped_ptr<ResourceProvider> m_resourceProvider;
scoped_ptr<ResourceUpdateQueue> m_queue;
scoped_ptr<PrioritizedResource> m_textures[4];
« cc/layer_tree_host.cc ('K') | « cc/resource_provider_unittest.cc ('k') | cc/scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698