diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 04:37:17 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 04:37:17 +0000 |
commit | 3b9f2df0b78911631b92fff4c174a37fd8077482 (patch) | |
tree | 7eceed9124cdad273658f9c813a51ccd37bfcdf0 /cc/resource_update_controller_unittest.cc | |
parent | 5b3065b13476000a1940aeabfec125c736d687da (diff) | |
download | chromium_src-3b9f2df0b78911631b92fff4c174a37fd8077482.zip chromium_src-3b9f2df0b78911631b92fff4c174a37fd8077482.tar.gz chromium_src-3b9f2df0b78911631b92fff4c174a37fd8077482.tar.bz2 |
cc: Finish the rename from cc::GraphicsContext to cc::OutputSurface
It is far too confusing to deal with OutputSurface code when half the time it is
called a GraphicsContext in correctly. Cleaning this up so I can think about the
code properly as I upstream the Ubercomp CL.
NOTRY=true
R=jamesr,piman
BUG=146080
Review URL: https://chromiumcodereview.appspot.com/11450019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_update_controller_unittest.cc')
-rw-r--r-- | cc/resource_update_controller_unittest.cc | 6 |
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]; |