| 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();
|
|
|