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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 8558030: Prepare Chromium for WebCompositor::initialize. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index f74e1f534623f4f2360674f49808287e5f431ebc..656aa095a5650ea458ca667057eae97d71a9a6e8 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -245,6 +245,9 @@ RenderThreadImpl::~RenderThreadImpl() {
if (file_thread_.get())
file_thread_->Stop();
+#if WEBCOMPOSITOR_HAS_INITIALIZE
+ WebCompositor::shutdown();
+#endif
if (compositor_thread_.get()) {
RemoveFilter(compositor_thread_->GetMessageFilter());
compositor_thread_.reset();
@@ -433,6 +436,15 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
switches::kEnableThreadedCompositing)) {
compositor_thread_.reset(new CompositorThread(this));
AddFilter(compositor_thread_->GetMessageFilter());
+#if WEBCOMPOSITOR_HAS_INITIALIZE
+ WebCompositor::initialize(compositor_thread_->GetWebThread());
+#else
+ WebCompositor::setThread(compositor_thread_->GetWebThread());
+#endif
+ } else {
+#if WEBCOMPOSITOR_HAS_INITIALIZE
+ WebCompositor::initialize(NULL);
+#endif
}
WebScriptController::enableV8SingleThreadMode();

Powered by Google App Engine
This is Rietveld 408576698