Third patch in getting rid of caching MessageLoop pointers and always using C...

chrome/browser/renderer_host/render_widget_helper.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/browser/renderer_host/render_widget_helper.h"
 
 #include "base/eintr_wrapper.h"
 #include "base/thread.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/common/render_messages.h"
 
 // A Task used with InvokeLater that we hold a pointer to in pending_paints_.
 // Instances are deleted by MessageLoop after it calls their Run method.
 class RenderWidgetHelper::PaintMsgProxy : public Task {
  public:
   PaintMsgProxy(RenderWidgetHelper* h, const IPC::Message& m)
@@ skipping 18 matching lines @@
 
   scoped_refptr<RenderWidgetHelper> helper;
   IPC::Message message;
   bool cancelled;  // If true, then the message will not be dispatched.
 
   DISALLOW_COPY_AND_ASSIGN(PaintMsgProxy);
 };
 
 RenderWidgetHelper::RenderWidgetHelper()
     : render_process_id_(-1),
-      ui_loop_(MessageLoop::current()),
 #if defined(OS_WIN)
       event_(CreateEvent(NULL, FALSE /* auto-reset */, FALSE, NULL)),
 #elif defined(OS_POSIX)
       event_(false /* auto-reset */, false),
 #endif
       resource_dispatcher_host_(NULL) {
 }
 
 RenderWidgetHelper::~RenderWidgetHelper() {
   // The elements of pending_paints_ each hold an owning reference back to this
@@ skipping 10 matching lines @@
     ResourceDispatcherHost* resource_dispatcher_host) {
   render_process_id_ = render_process_id;
   resource_dispatcher_host_ = resource_dispatcher_host;
 }
 
 int RenderWidgetHelper::GetNextRoutingID() {
   return next_routing_id_.GetNext() + 1;
 }
 
 void RenderWidgetHelper::CancelResourceRequests(int render_widget_id) {
-  if (g_browser_process->io_thread() && render_process_id_ != -1) {
-    g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(this,
-                          &RenderWidgetHelper::OnCancelResourceRequests,
-                          render_widget_id));
-  }
+  if (render_process_id_ == -1)
+    return;
+
+  ChromeThread::PostTask(
+      ChromeThread::IO, FROM_HERE,
+      NewRunnableMethod(this,
+                        &RenderWidgetHelper::OnCancelResourceRequests,
+                        render_widget_id));
 }
 
 void RenderWidgetHelper::CrossSiteClosePageACK(
     const ViewMsg_ClosePage_Params& params) {
-  if (g_browser_process->io_thread()) {
-    g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(this,
-                          &RenderWidgetHelper::OnCrossSiteClosePageACK,
-                          params));
-  }
+  ChromeThread::PostTask(
+      ChromeThread::IO, FROM_HERE,
+      NewRunnableMethod(this,
+                        &RenderWidgetHelper::OnCrossSiteClosePageACK,
+                        params));
 }
 
 bool RenderWidgetHelper::WaitForPaintMsg(int render_widget_id,
                                          const base::TimeDelta& max_delay,
                                          IPC::Message* msg) {
   base::TimeTicks time_start = base::TimeTicks::Now();
 
   for (;;) {
     PaintMsgProxy* proxy = NULL;
     {
@@ skipping 49 matching lines @@
 
     result.first->second = (proxy = new PaintMsgProxy(this, msg));
   }
 
   // Notify anyone waiting on the UI thread that there is a new entry in the
   // proxy map.  If they don't find the entry they are looking for, then they
   // will just continue waiting.
   event_.Signal();
 
   // The proxy will be deleted when it is run as a task.
-  ui_loop_->PostTask(FROM_HERE, proxy);
+  ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, proxy);
 }
 
 void RenderWidgetHelper::OnDiscardPaintMsg(PaintMsgProxy* proxy) {
   const IPC::Message& msg = proxy->message;
 
   // Remove the proxy from the map now that we are going to handle it normally.
   {
     AutoLock lock(pending_paints_lock_);
 
     PaintMsgProxyMap::iterator it = pending_paints_.find(msg.routing_id());
@@ skipping 27 matching lines @@
 void RenderWidgetHelper::CreateNewWindow(int opener_id,
                                          bool user_gesture,
                                          base::ProcessHandle render_process,
                                          int* route_id) {
   *route_id = GetNextRoutingID();
   // Block resource requests until the view is created, since the HWND might be
   // needed if a response ends up creating a plugin.
   resource_dispatcher_host_->BlockRequestsForRoute(
       render_process_id_, *route_id);
 
-  ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &RenderWidgetHelper::OnCreateWindowOnUI, opener_id, *route_id));
+  ChromeThread::PostTask(
+      ChromeThread::UI, FROM_HERE,
+      NewRunnableMethod(
+          this, &RenderWidgetHelper::OnCreateWindowOnUI, opener_id, *route_id));
 }
 
 void RenderWidgetHelper::OnCreateWindowOnUI(int opener_id, int route_id) {
   RenderViewHost* host = RenderViewHost::FromID(render_process_id_, opener_id);
   if (host)
     host->CreateNewWindow(route_id);
 
-  g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
+  ChromeThread::PostTask(
+      ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(this, &RenderWidgetHelper::OnCreateWindowOnIO,
                         route_id));
 }
 
 void RenderWidgetHelper::OnCreateWindowOnIO(int route_id) {
   resource_dispatcher_host_->ResumeBlockedRequestsForRoute(
       render_process_id_, route_id);
 }
 
 void RenderWidgetHelper::CreateNewWidget(int opener_id,
                                          bool activatable,
                                          int* route_id) {
   *route_id = GetNextRoutingID();
-  ui_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &RenderWidgetHelper::OnCreateWidgetOnUI, opener_id, *route_id,
-      activatable));
+  ChromeThread::PostTask(
+      ChromeThread::UI, FROM_HERE,
+      NewRunnableMethod(
+          this, &RenderWidgetHelper::OnCreateWidgetOnUI, opener_id, *route_id,
+          activatable));
 }
 
 void RenderWidgetHelper::OnCreateWidgetOnUI(
     int opener_id, int route_id, bool activatable) {
   RenderViewHost* host = RenderViewHost::FromID(render_process_id_, opener_id);
   if (host)
     host->CreateNewWidget(route_id, activatable);
 }
 
 #if defined(OS_MACOSX)
@@ skipping 42 matching lines @@
 
 void RenderWidgetHelper::ClearAllocatedDIBs() {
   for (std::map<TransportDIB::Id, int>::iterator
        i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) {
     HANDLE_EINTR(close(i->second));
   }
 
   allocated_dibs_.clear();
 }
 #endif