summaryrefslogtreecommitdiffstats
path: root/cc/resource_update_controller_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'cc/resource_update_controller_unittest.cc')
-rw-r--r--cc/resource_update_controller_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
index fad3f26..4b324b6 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];