summaryrefslogtreecommitdiffstats
path: root/cc/nine_patch_layer_unittest.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 04:37:17 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 04:37:17 +0000
commit3b9f2df0b78911631b92fff4c174a37fd8077482 (patch)
tree7eceed9124cdad273658f9c813a51ccd37bfcdf0 /cc/nine_patch_layer_unittest.cc
parent5b3065b13476000a1940aeabfec125c736d687da (diff)
downloadchromium_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/nine_patch_layer_unittest.cc')
-rw-r--r--cc/nine_patch_layer_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/nine_patch_layer_unittest.cc b/cc/nine_patch_layer_unittest.cc
index ead0d60..520f8d5 100644
--- a/cc/nine_patch_layer_unittest.cc
+++ b/cc/nine_patch_layer_unittest.cc
@@ -12,8 +12,8 @@
#include "cc/single_thread_proxy.h"
#include "cc/resource_update_queue.h"
#include "cc/texture_uploader.h"
-#include "cc/test/fake_graphics_context.h"
#include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/test/fake_output_surface.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/layer_tree_test_common.h"
#include "SkBitmap.h"
@@ -103,13 +103,13 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
m_layerTreeHost->contentsTextureManager()->setMaxMemoryLimitBytes(1024 * 1024);
m_layerTreeHost->contentsTextureManager()->prioritizeTextures();
- scoped_ptr<GraphicsContext> context;
+ scoped_ptr<OutputSurface> outputSurface;
scoped_ptr<ResourceProvider> resourceProvider;
{
DebugScopedSetImplThread implThread(proxy());
DebugScopedSetMainThreadBlocked mainThreadBlocked(proxy());
- context = WebKit::createFakeGraphicsContext();
- resourceProvider = ResourceProvider::create(context.get());
+ outputSurface = createFakeOutputSurface();
+ resourceProvider = ResourceProvider::create(outputSurface.get());
params.texture->acquireBackingTexture(resourceProvider.get());
ASSERT_TRUE(params.texture->haveBackingTexture());
}