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

Unified Diff: webkit/support/web_layer_tree_view_impl_for_testing.cc

Issue 17114008: cc: Remove cc::Thread and cc::ThreadImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm-thread: NULLrefptrs Created 7 years, 6 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 | « webkit/support/web_layer_tree_view_impl_for_testing.h ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/web_layer_tree_view_impl_for_testing.cc
diff --git a/webkit/support/web_layer_tree_view_impl_for_testing.cc b/webkit/support/web_layer_tree_view_impl_for_testing.cc
index 6cbb74c6e591b254dea48684f61453c9924f5921..b49639578215a301e998ca92002b81ce76463a5c 100644
--- a/webkit/support/web_layer_tree_view_impl_for_testing.cc
+++ b/webkit/support/web_layer_tree_view_impl_for_testing.cc
@@ -8,8 +8,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/synchronization/lock.h"
#include "cc/base/switches.h"
-#include "cc/base/thread.h"
-#include "cc/base/thread_impl.h"
#include "cc/debug/fake_web_graphics_context_3d.h"
#include "cc/input/input_handler.h"
#include "cc/layers/layer.h"
@@ -43,8 +41,7 @@ WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting(
WebLayerTreeViewImplForTesting::~WebLayerTreeViewImplForTesting() {}
-bool WebLayerTreeViewImplForTesting::Initialize(
- scoped_ptr<cc::Thread> compositor_thread) {
+bool WebLayerTreeViewImplForTesting::Initialize() {
cc::LayerTreeSettings settings;
// For web contents, layer transforms should scale up the contents of layers
@@ -55,8 +52,7 @@ bool WebLayerTreeViewImplForTesting::Initialize(
// tests.
settings.accelerated_animation_enabled =
type_ == webkit_support::FAKE_CONTEXT;
- layer_tree_host_ =
- cc::LayerTreeHost::Create(this, settings, compositor_thread.Pass());
+ layer_tree_host_ = cc::LayerTreeHost::Create(this, settings, NULL);
if (!layer_tree_host_)
return false;
return true;
« no previous file with comments | « webkit/support/web_layer_tree_view_impl_for_testing.h ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698