Switch child threads so that current() only works on the correct thread and t...

chrome/renderer/render_thread.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_thread.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/lazy_instance.h"
 #include "base/shared_memory.h"
 #include "base/stats_table.h"
+#include "base/thread_local.h"
 #include "chrome/common/app_cache/app_cache_context_impl.h"
 #include "chrome/common/app_cache/app_cache_dispatcher.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_util.h"
 // TODO(port)
 #if defined(OS_WIN)
@@ skipping 27 matching lines @@
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objbase.h>
 #endif
 
 using WebKit::WebCache;
 using WebKit::WebString;
 
 static const unsigned int kCacheStatsDelayMS = 2000 /* milliseconds */;
 
+static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
+    base::LINKER_INITIALIZED);
+
 //-----------------------------------------------------------------------------
 // Methods below are only called on the owner's thread:
 
 // When we run plugins in process, we actually run them on the render thread,
 // which means that we need to make the render thread pump UI events.
 RenderThread::RenderThread()
     : ChildThread(
           base::Thread::Options(RenderProcess::InProcessPlugins() ?
               MessageLoop::TYPE_UI : MessageLoop::TYPE_DEFAULT, kV8StackSize)),
       plugin_refresh_allowed_(true) {
 }
 
 RenderThread::RenderThread(const std::string& channel_name)
     : ChildThread(
           base::Thread::Options(RenderProcess::InProcessPlugins() ?
               MessageLoop::TYPE_UI : MessageLoop::TYPE_DEFAULT, kV8StackSize)),
       plugin_refresh_allowed_(true) {
   SetChannelName(channel_name);
 }
 
 RenderThread::~RenderThread() {
 }
 
 RenderThread* RenderThread::current() {
-  DCHECK(!IsPluginProcess());
-  return static_cast<RenderThread*>(ChildThread::current());
+  return lazy_tls.Pointer()->Get();
 }
 
 void RenderThread::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
   channel()->AddFilter(filter);
 }
 
 void RenderThread::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) {
   channel()->RemoveFilter(filter);
 }
 
@@ skipping 25 matching lines @@
     // the CPU.
     //
     // So, we install a filter on the channel so that we can process this event
     // here and kill the process.
     _exit(0);
   }
 };
 #endif
 
 void RenderThread::Init() {
+  lazy_tls.Pointer()->Set(this);
 #if defined(OS_WIN)
   // If you are running plugins in this thread you need COM active but in
   // the normal case you don't.
   if (RenderProcess::InProcessPlugins())
     CoInitialize(0);
 #endif
 
   ChildThread::Init();
   notification_service_.reset(new NotificationService);
   cache_stats_factory_.reset(
@@ skipping 24 matching lines @@
   dns_master_.reset();
   user_script_slave_.reset();
   visited_link_slave_.reset();
 
   if (webkit_client_.get()) {
     WebKit::shutdown();
     webkit_client_.reset();
   }
 
   notification_service_.reset();
-
   ChildThread::CleanUp();
+  lazy_tls.Pointer()->Set(NULL);
 
   // TODO(port)
 #if defined(OS_WIN)
   // Clean up plugin channels before this thread goes away.
   PluginChannelBase::CleanupChannels();
   // Don't call COM if the renderer is in the sandbox.
   if (RenderProcess::InProcessPlugins())
     CoUninitialize();
 #endif
 }
@@ skipping 207 matching lines @@
 
 void RenderThread::OnPurgePluginListCache() {
   // The call below will cause a GetPlugins call with refresh=true, but at this
   // point we already know that the browser has refreshed its list, so disable
   // refresh temporarily to prevent each renderer process causing the list to be
   // regenerated.
   plugin_refresh_allowed_ = false;
   WebKit::resetPluginCache();
   plugin_refresh_allowed_ = true;
 }