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

Unified Diff: ui/compositor/compositor.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
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index b06f205152bd3fd227e5786c4f57949528c0ab07..e9e5181452056cfbbbb887aeb9134c1ab6d69458 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -16,7 +16,6 @@
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
#include "cc/base/switches.h"
-#include "cc/base/thread_impl.h"
#include "cc/input/input_handler.h"
#include "cc/layers/layer.h"
#include "cc/output/context_provider.h"
@@ -523,13 +522,10 @@ Compositor::Compositor(CompositorDelegate* delegate,
settings.initial_debug_state.show_non_occluding_rects =
command_line->HasSwitch(cc::switches::kUIShowNonOccludingRects);
- scoped_ptr<cc::Thread> thread;
- if (g_compositor_thread) {
- thread = cc::ThreadImpl::CreateForDifferentThread(
- g_compositor_thread->message_loop_proxy());
- }
+ scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner =
+ g_compositor_thread ? g_compositor_thread->message_loop_proxy() : NULL;
- host_ = cc::LayerTreeHost::Create(this, settings, thread.Pass());
+ host_ = cc::LayerTreeHost::Create(this, settings, compositor_task_runner);
host_->SetRootLayer(root_web_layer_);
host_->SetLayerTreeHostClientReady();
}
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | webkit/renderer/compositor_bindings/web_compositor_support_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698