Revert 34951 - Combine ViewHostMsg_{Paint,Scroll}Rect into one IPC....

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/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::UpdateMsgProxy : public Task {
+class RenderWidgetHelper::PaintMsgProxy : public Task {
  public:
-  UpdateMsgProxy(RenderWidgetHelper* h, const IPC::Message& m)
+  PaintMsgProxy(RenderWidgetHelper* h, const IPC::Message& m)
       : helper(h),
         message(m),
         cancelled(false) {
   }
 
-  ~UpdateMsgProxy() {
+  ~PaintMsgProxy() {
     // If the paint message was never dispatched, then we need to let the
     // helper know that we are going away.
     if (!cancelled && helper)
-      helper->OnDiscardUpdateMsg(this);
+      helper->OnDiscardPaintMsg(this);
   }
 
   virtual void Run() {
     if (!cancelled) {
-      helper->OnDispatchUpdateMsg(this);
+      helper->OnDispatchPaintMsg(this);
       helper = NULL;
     }
   }
 
   scoped_refptr<RenderWidgetHelper> helper;
   IPC::Message message;
   bool cancelled;  // If true, then the message will not be dispatched.
 
-  DISALLOW_COPY_AND_ASSIGN(UpdateMsgProxy);
+  DISALLOW_COPY_AND_ASSIGN(PaintMsgProxy);
 };
 
 RenderWidgetHelper::RenderWidgetHelper()
     : render_process_id_(-1),
 #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) {
@@ skipping 33 matching lines @@
 
 void RenderWidgetHelper::CrossSiteClosePageACK(
     const ViewMsg_ClosePage_Params& params) {
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(this,
                         &RenderWidgetHelper::OnCrossSiteClosePageACK,
                         params));
 }
 
-bool RenderWidgetHelper::WaitForUpdateMsg(int render_widget_id,
-                                          const base::TimeDelta& max_delay,
-                                          IPC::Message* msg) {
+bool RenderWidgetHelper::WaitForPaintMsg(int render_widget_id,
+                                         const base::TimeDelta& max_delay,
+                                         IPC::Message* msg) {
   base::TimeTicks time_start = base::TimeTicks::Now();
 
   for (;;) {
-    UpdateMsgProxy* proxy = NULL;
+    PaintMsgProxy* proxy = NULL;
     {
       AutoLock lock(pending_paints_lock_);
 
-      UpdateMsgProxyMap::iterator it = pending_paints_.find(render_widget_id);
+      PaintMsgProxyMap::iterator it = pending_paints_.find(render_widget_id);
       if (it != pending_paints_.end()) {
         proxy = it->second;
 
         // Flag the proxy as cancelled so that when it is run as a task it will
         // do nothing.
         proxy->cancelled = true;
 
         pending_paints_.erase(it);
       }
     }
 
     if (proxy) {
       *msg = proxy->message;
       DCHECK(msg->routing_id() == render_widget_id);
       return true;
     }
 
     // Calculate the maximum amount of time that we are willing to sleep.
     base::TimeDelta max_sleep_time =
         max_delay - (base::TimeTicks::Now() - time_start);
     if (max_sleep_time <= base::TimeDelta::FromMilliseconds(0))
       break;
 
     event_.TimedWait(max_sleep_time);
   }
 
   return false;
 }
 
-void RenderWidgetHelper::DidReceiveUpdateMsg(const IPC::Message& msg) {
+void RenderWidgetHelper::DidReceivePaintMsg(const IPC::Message& msg) {
   int render_widget_id = msg.routing_id();
 
-  UpdateMsgProxy* proxy = NULL;
+  PaintMsgProxy* proxy = NULL;
   {
     AutoLock lock(pending_paints_lock_);
 
-    UpdateMsgProxyMap::value_type new_value(render_widget_id, NULL);
+    PaintMsgProxyMap::value_type new_value(render_widget_id, NULL);
 
     // We expect only a single PaintRect message at a time.  Optimize for the
     // case that we don't already have an entry by using the 'insert' method.
-    std::pair<UpdateMsgProxyMap::iterator, bool> result =
+    std::pair<PaintMsgProxyMap::iterator, bool> result =
         pending_paints_.insert(new_value);
     if (!result.second) {
       NOTREACHED() << "Unexpected PaintRect message!";
       return;
     }
 
-    result.first->second = (proxy = new UpdateMsgProxy(this, msg));
+    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.
   ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, proxy);
 }
 
-void RenderWidgetHelper::OnDiscardUpdateMsg(UpdateMsgProxy* 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_);
 
-    UpdateMsgProxyMap::iterator it = pending_paints_.find(msg.routing_id());
+    PaintMsgProxyMap::iterator it = pending_paints_.find(msg.routing_id());
     DCHECK(it != pending_paints_.end());
     DCHECK(it->second == proxy);
 
     pending_paints_.erase(it);
   }
 }
 
-void RenderWidgetHelper::OnDispatchUpdateMsg(UpdateMsgProxy* proxy) {
-  OnDiscardUpdateMsg(proxy);
+void RenderWidgetHelper::OnDispatchPaintMsg(PaintMsgProxy* proxy) {
+  OnDiscardPaintMsg(proxy);
 
   // It is reasonable for the host to no longer exist.
   RenderProcessHost* host = RenderProcessHost::FromID(render_process_id_);
   if (host)
     host->OnMessageReceived(proxy->message);
 }
 
 void RenderWidgetHelper::OnCancelResourceRequests(
     int render_widget_id) {
   resource_dispatcher_host_->CancelRequestsForRoute(
@@ skipping 101 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