| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index f60a36cbee83b7715d11a98485966cee6382f024..3b2ff69cf48366cb6fcdfae4420f3a28611dd66c 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -401,13 +401,6 @@
|
| Init();
|
| }
|
|
|
| -RenderThreadImpl::RenderThreadImpl(
|
| - scoped_ptr<base::MessageLoop> main_message_loop)
|
| - : ChildThread(Options(ShouldUseMojoChannel())),
|
| - main_message_loop_(main_message_loop.Pass()) {
|
| - Init();
|
| -}
|
| -
|
| void RenderThreadImpl::Init() {
|
| TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, "");
|
|
|
| @@ -664,24 +657,16 @@
|
|
|
| main_thread_compositor_task_runner_ = NULL;
|
|
|
| - gpu_channel_ = NULL;
|
| + if (webkit_platform_support_)
|
| + blink::shutdown();
|
| +
|
| + lazy_tls.Pointer()->Set(NULL);
|
|
|
| // TODO(port)
|
| #if defined(OS_WIN)
|
| // Clean up plugin channels before this thread goes away.
|
| NPChannelBase::CleanupChannels();
|
| #endif
|
| -
|
| - // Shut down the message loop before shutting down Blink.
|
| - // This prevents a scenario where a pending task in the message loop accesses
|
| - // Blink objects after Blink shuts down.
|
| - // This must be at the very end of the shutdown sequence. You must not touch
|
| - // the message loop after this.
|
| - main_message_loop_.reset();
|
| - if (webkit_platform_support_)
|
| - blink::shutdown();
|
| -
|
| - lazy_tls.Pointer()->Set(NULL);
|
| }
|
|
|
| bool RenderThreadImpl::Send(IPC::Message* msg) {
|
|
|