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

Unified Diff: cc/tiled_layer_unittest.cc

Issue 11450019: Finish the rename from cc::GraphicsContext to cc::OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: cc/tiled_layer_unittest.cc
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 0c652908549b065471eae7b023692f5621879abe..44f1bd94b4d4afb104ad65e88a10460c6983b543 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -11,8 +11,8 @@
#include "cc/resource_update_controller.h"
#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
#include "cc/test/animation_test_common.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/fake_proxy.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/tiled_layer_test_common.h"
@@ -48,7 +48,7 @@ class TiledLayerTest : public testing::Test {
public:
TiledLayerTest()
: m_proxy(NULL)
- , m_context(WebKit::createFakeGraphicsContext())
+ , m_outputSurface(createFakeOutputSurface())
, m_queue(make_scoped_ptr(new ResourceUpdateQueue))
, m_occlusion(0)
{
@@ -61,7 +61,7 @@ public:
m_resourceManager = PrioritizedResourceManager::create(Renderer::ContentPool, m_proxy);
m_layerTreeHost->initializeRendererIfNeeded();
DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked(m_proxy);
- m_resourceProvider = ResourceProvider::create(m_context.get());
+ m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
}
virtual ~TiledLayerTest()
@@ -164,7 +164,7 @@ public:
public:
Proxy* m_proxy;
LayerTreeSettings m_settings;
- scoped_ptr<GraphicsContext> m_context;
+ scoped_ptr<OutputSurface> m_outputSurface;
scoped_ptr<ResourceProvider> m_resourceProvider;
scoped_ptr<ResourceUpdateQueue> m_queue;
RenderingStats m_stats;
« cc/layer_tree_host.cc ('K') | « cc/tiled_layer_impl.cc ('k') | cc/video_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698