Revert r21117 as it caused reliability failures....

chrome/renderer/render_process.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 29 matching lines @@
     file_util::ReadFileToString(FilePath("/proc/sys/kernel/shmmax"), &contents);
     size = strtoul(contents.c_str(), NULL, 0);
   }
 #endif
   return size;
 }
 
 //-----------------------------------------------------------------------------
 
 RenderProcess::RenderProcess()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(shared_mem_cache_cleaner_(
+    : ChildProcess(new RenderThread()),
+      ALLOW_THIS_IN_INITIALIZER_LIST(shared_mem_cache_cleaner_(
           base::TimeDelta::FromSeconds(5),
           this, &RenderProcess::ClearTransportDIBCache)),
       sequence_number_(0) {
+  Init();
+}
+
+RenderProcess::RenderProcess(const std::string& channel_name)
+    : ChildProcess(new RenderThread(channel_name)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(shared_mem_cache_cleaner_(
+          base::TimeDelta::FromSeconds(5),
+          this, &RenderProcess::ClearTransportDIBCache)),
+      sequence_number_(0) {
+  Init();
+}
+
+RenderProcess::~RenderProcess() {
+  // TODO(port)
+  // Try and limit what we pull in for our non-Win unit test bundle
+#ifndef NDEBUG
+  // log important leaked objects
+  webkit_glue::CheckForLeaks();
+#endif
+
+  GetShutDownEvent()->Signal();
+
+  // We need to stop the RenderThread as the clearer_factory_
+  // member could be in use while the object itself is destroyed,
+  // as a result of the containing RenderProcess object being destroyed.
+  // This race condition causes a crash when the renderer process is shutting
+  // down.
+  child_thread()->Stop();
+  ClearTransportDIBCache();
+}
+
+void RenderProcess::Init() {
   in_process_plugins_ = InProcessPlugins();
   for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i)
     shared_mem_cache_[i] = NULL;
 
 #if defined(OS_WIN)
   // HACK:  See http://b/issue?id=1024307 for rationale.
   if (GetModuleHandle(L"LPK.DLL") == NULL) {
     // Makes sure lpk.dll is loaded by gdi32 to make sure ExtTextOut() works
     // when buffering into a EMF buffer for printing.
     typedef BOOL (__stdcall *GdiInitializeLanguagePack)(int LoadedShapingDLLs);
@@ skipping 27 matching lines @@
   if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) {
     StatisticsRecorder::set_dump_on_exit(true);
   }
 
   FilePath module_path;
   initialized_media_library_ =
       PathService::Get(base::DIR_MODULE, &module_path) &&
       media::InitializeMediaLibrary(module_path);
 }
 
-RenderProcess::~RenderProcess() {
-  // TODO(port)
-  // Try and limit what we pull in for our non-Win unit test bundle
-#ifndef NDEBUG
-  // log important leaked objects
-  webkit_glue::CheckForLeaks();
-#endif
-
-  GetShutDownEvent()->Signal();
-  ClearTransportDIBCache();
-}
-
 bool RenderProcess::InProcessPlugins() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 #if defined(OS_LINUX)
   // Plugin processes require a UI message loop, and the Linux message loop
   // implementation only allows one UI loop per process.
   if (command_line.HasSwitch(switches::kInProcessPlugins))
     NOTIMPLEMENTED() << ": in process plugins not supported on Linux";
   return command_line.HasSwitch(switches::kInProcessPlugins);
 #else
   return command_line.HasSwitch(switches::kInProcessPlugins) ||
          command_line.HasSwitch(switches::kSingleProcess);
 #endif
 }
 
 // -----------------------------------------------------------------------------
 // Platform specific code for dealing with bitmap transport...
 
 TransportDIB* RenderProcess::CreateTransportDIB(size_t size) {
 #if defined(OS_WIN) || defined(OS_LINUX)
   // Windows and Linux create transport DIBs inside the renderer
   return TransportDIB::Create(size, sequence_number_++);
 #elif defined(OS_MACOSX)  // defined(OS_WIN) || defined(OS_LINUX)
   // Mac creates transport DIBs in the browser, so we need to do a sync IPC to
   // get one.
   TransportDIB::Handle handle;
   IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, &handle);
-  if (!main_thread()->Send(msg))
+  if (!child_thread()->Send(msg))
     return NULL;
   if (handle.fd < 0)
     return NULL;
   return TransportDIB::Map(handle);
 #endif  // defined(OS_MACOSX)
 }
 
 void RenderProcess::FreeTransportDIB(TransportDIB* dib) {
   if (!dib)
     return;
 
 #if defined(OS_MACOSX)
   // On Mac we need to tell the browser that it can drop a reference to the
   // shared memory.
   IPC::Message* msg = new ViewHostMsg_FreeTransportDIB(dib->id());
-  main_thread()->Send(msg);
+  child_thread()->Send(msg);
 #endif
 
   delete dib;
 }
 
 // -----------------------------------------------------------------------------
 
 
 skia::PlatformCanvas* RenderProcess::GetDrawingCanvas(
     TransportDIB** memory, const gfx::Rect& rect) {
@@ skipping 81 matching lines @@
 }
 
 void RenderProcess::ClearTransportDIBCache() {
   for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) {
     if (shared_mem_cache_[i]) {
       FreeTransportDIB(shared_mem_cache_[i]);
       shared_mem_cache_[i] = NULL;
     }
   }
 }