Fix windows gpu bots

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2011 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 "content/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 164 matching lines @@
       case WM_MBUTTONDOWN:
         ::SendMessage(GetParent(window), message, wparam, lparam);
         return 0;
       default:
         break;
     }
   }
   return ::DefWindowProc(window, message, wparam, lparam);
 }
 
+void SendToGpuProcessHost(int gpu_host_id, IPC::Message* message) {
+  GpuProcessHost* gpu_process_host = GpuProcessHost::FromID(gpu_host_id);
+  if (!gpu_process_host) {
+    delete message;
+    return;
+  }
+
+  gpu_process_host->Send(message);
+}
+
+void PostTaskOnIOThread(const tracked_objects::Location& from_here,
+                        base::Closure task) {
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, task);

[darin (slow to review), 2011/12/12 23:54:32]

perhaps you meant to forward |from_here|?

[piman, 2011/12/13 00:35:41]

Probably... I was just reverting part of the CL, so this was the previous code.
In this version, the function has disappeared, so problem goes away.

+}
+
 bool DecodeZoomGesture(HWND hwnd, const GESTUREINFO& gi,
                        content::PageZoom* zoom,
                        POINT* zoom_center) {
   static long start = 0;
   static POINT zoom_first;
 
   if (gi.dwFlags == GF_BEGIN) {
     start = gi.ullArguments;
     zoom_first.x = gi.ptsLocation.x;
     zoom_first.y = gi.ptsLocation.y;
@@ skipping 1833 matching lines @@
 
 void RenderWidgetHostViewWin::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
   if (params.surface_id) {
     if (!accelerated_surface_.get() && compositor_host_window_) {
       accelerated_surface_ = new AcceleratedSurface(compositor_host_window_);
       accelerated_surface_->Initialize();
     }
 
+    base::Closure acknowledge_task = base::Bind(
+        SendToGpuProcessHost,
+        gpu_host_id,
+        new AcceleratedSurfaceMsg_BuffersSwappedACK(params.route_id));

[darin (slow to review), 2011/12/12 23:54:32]

it seems like you should be using the new Passed() / .Pass() feature that ajwong
just posted to chromium-dev about.  that way if the acknowledge_task fails to
run, you won't incur a memory leak.

[piman, 2011/12/13 00:35:41]

Done.

+
     accelerated_surface_->AsyncPresentAndAcknowledge(
         params.size,
         params.surface_id,
-        base::Bind(&RenderWidgetHost::AcknowledgeSwapBuffers,
-                   gpu_host_id,
-                   params.route_id));
+        base::Bind(PostTaskOnIOThread, FROM_HERE, acknowledge_task));

[darin (slow to review), 2011/12/12 23:54:32]

hmm, seems like it might be nice to add PostTaskOnIOThread to browser_thread.h.

[piman, 2011/12/13 00:35:41]

I removed that function.
We could argue whether or not we want to add that to the public content
interface (BrowserThread is public), but we should do that in another CL that
involves appropriate OWNERS.
This CL is a partial revert to fix the GPU bots, I would like to avoid bike
shedding here, so that we can land it quickly and unblock people.

[piman, 2011/12/13 01:04:50]

Turns out, it's actually needed for overload resolution. So it's back (with
FROM_HERE->from_here).

   } else {
     RenderWidgetHost::AcknowledgeSwapBuffers(params.route_id, gpu_host_id);
   }
 }
 
 void RenderWidgetHostViewWin::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
   RenderWidgetHost::AcknowledgePostSubBuffer(params.route_id, gpu_host_id);
 }
@@ skipping 417 matching lines @@
 
   size_t offset = selection_range_.GetMin() - selection_text_offset_;
   memcpy(reinterpret_cast<char*>(reconv) + sizeof(RECONVERTSTRING),
          selection_text_.c_str() + offset, len * sizeof(WCHAR));
 
   // According to Microsft API document, IMR_RECONVERTSTRING and
   // IMR_DOCUMENTFEED should return reconv, but some applications return
   // need_size.
   return reinterpret_cast<LRESULT>(reconv);
 }