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

Unified Diff: cc/nine_patch_layer_unittest.cc

Issue 11439026: Revert 171403 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « cc/nine_patch_layer_impl.cc ('k') | cc/output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/nine_patch_layer_unittest.cc
===================================================================
--- cc/nine_patch_layer_unittest.cc (revision 171405)
+++ cc/nine_patch_layer_unittest.cc (working copy)
@@ -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 @@
m_layerTreeHost->contentsTextureManager()->setMaxMemoryLimitBytes(1024 * 1024);
m_layerTreeHost->contentsTextureManager()->prioritizeTextures();
- scoped_ptr<OutputSurface> outputSurface;
+ scoped_ptr<GraphicsContext> context;
scoped_ptr<ResourceProvider> resourceProvider;
{
DebugScopedSetImplThread implThread(proxy());
DebugScopedSetMainThreadBlocked mainThreadBlocked(proxy());
- outputSurface = createFakeOutputSurface();
- resourceProvider = ResourceProvider::create(outputSurface.get());
+ context = WebKit::createFakeGraphicsContext();
+ resourceProvider = ResourceProvider::create(context.get());
params.texture->acquireBackingTexture(resourceProvider.get());
ASSERT_TRUE(params.texture->haveBackingTexture());
}
« no previous file with comments | « cc/nine_patch_layer_impl.cc ('k') | cc/output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698