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

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: clang-format Created 7 years, 4 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
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/test/test_web_graphics_context_3d.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 224e2cf31ee9c96907fbb8317742d5734075a1ac..71ea856e6535996fd03ea0058a29ac0aefb5d8c1 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"
@@ -615,7 +615,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;
}
@@ -626,7 +627,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_;
}
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/test/test_web_graphics_context_3d.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698