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

Unified Diff: cc/test/layer_tree_test.cc

Issue 21026005: aura: Remove CreateOffscreenContext from ui::ContextFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: offscreencontext: rebase Created 7 years, 5 months 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/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 6193d845332e75e702fc5003f1b33e8f012bb5b1..e431cd5473f9c720058d8d2e1c7cbf8cbd2b24a8 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -10,12 +10,12 @@
#include "cc/animation/layer_animation_controller.h"
#include "cc/animation/timing_function.h"
#include "cc/base/switches.h"
+#include "cc/debug/fake_context_provider.h"
#include "cc/input/input_handler.h"
#include "cc/layers/content_layer.h"
#include "cc/layers/layer.h"
#include "cc/layers/layer_impl.h"
#include "cc/test/animation_test_common.h"
-#include "cc/test/fake_context_provider.h"
#include "cc/test/fake_layer_tree_host_client.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/occlusion_tracker_test_common.h"
@@ -614,7 +614,8 @@ scoped_refptr<cc::ContextProvider> LayerTreeTest::
OffscreenContextProviderForMainThread() {
if (!main_thread_contexts_.get() ||
main_thread_contexts_->DestroyedOnMainThread()) {
- main_thread_contexts_ = FakeContextProvider::Create();
+ main_thread_contexts_ = FakeContextProvider::Create(
+ TestWebGraphicsContext3D::CreateBaseFactory());
if (!main_thread_contexts_->BindToCurrentThread())
main_thread_contexts_ = NULL;
}
@@ -625,7 +626,8 @@ scoped_refptr<cc::ContextProvider> LayerTreeTest::
OffscreenContextProviderForCompositorThread() {
if (!compositor_thread_contexts_.get() ||
compositor_thread_contexts_->DestroyedOnMainThread())
- compositor_thread_contexts_ = FakeContextProvider::Create();
+ compositor_thread_contexts_ = FakeContextProvider::Create(
+ TestWebGraphicsContext3D::CreateBaseFactory());
return compositor_thread_contexts_;
}

Powered by Google App Engine
This is Rietveld 408576698