diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:13:20 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 06:13:20 +0000 |
commit | 3be2171df16267e9fa5644f1e7ea09edd45e13ca (patch) | |
tree | 4cd9165ad8d7e624bf4e33bea7c0fb36b1dcc688 /cc/prioritized_resource_unittest.cc | |
parent | 51e5bdcb18a9b316761e4361fc0befa9767de0a0 (diff) | |
download | chromium_src-3be2171df16267e9fa5644f1e7ea09edd45e13ca.zip chromium_src-3be2171df16267e9fa5644f1e7ea09edd45e13ca.tar.gz chromium_src-3be2171df16267e9fa5644f1e7ea09edd45e13ca.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 incorrectly. Cleaning this up so I can think about the
code properly as I upstream the Ubercomp CL.
R=jamesr,piman
BUG=146080
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171403
Review URL: https://codereview.chromium.org/11450019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/prioritized_resource_unittest.cc')
-rw-r--r-- | cc/prioritized_resource_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/prioritized_resource_unittest.cc b/cc/prioritized_resource_unittest.cc index 95bf7f9..173fd14 100644 --- a/cc/prioritized_resource_unittest.cc +++ b/cc/prioritized_resource_unittest.cc @@ -7,7 +7,7 @@ #include "cc/prioritized_resource_manager.h" #include "cc/resource.h" #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread -#include "cc/test/fake_graphics_context.h" +#include "cc/test/fake_output_surface.h" #include "cc/test/fake_proxy.h" #include "cc/test/tiled_layer_test_common.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,10 +22,10 @@ public: : m_proxy(scoped_ptr<Thread>(NULL)) , m_textureSize(256, 256) , m_textureFormat(GL_RGBA) - , m_context(WebKit::createFakeGraphicsContext()) + , m_outputSurface(createFakeOutputSurface()) { DebugScopedSetImplThread implThread(&m_proxy); - m_resourceProvider = ResourceProvider::create(m_context.get()); + m_resourceProvider = ResourceProvider::create(m_outputSurface.get()); } virtual ~PrioritizedResourceTest() @@ -98,7 +98,7 @@ protected: FakeProxy m_proxy; const gfx::Size m_textureSize; const GLenum m_textureFormat; - scoped_ptr<GraphicsContext> m_context; + scoped_ptr<OutputSurface> m_outputSurface; scoped_ptr<ResourceProvider> m_resourceProvider; }; |