Fix a browser, renderer, plugin deadlock caused by the change to reparent plugin windows in the b...

content/browser/plugin_process_host.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/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 54 matching lines @@
 }
 
 void PluginProcessHost::OnReparentPluginWindow(HWND window, HWND parent) {
   // Reparent only to our process.
   DWORD process_id = 0;
   ::GetWindowThreadProcessId(parent, &process_id);
   if (process_id != ::GetCurrentProcessId())
     return;
 
   if (webkit::npapi::WebPluginDelegateImpl::IsDummyActivationWindow(window)) {
-    ::SetWindowLongPtr(window, GWL_STYLE, WS_CHILD);
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        NewRunnableFunction(::SetWindowLongPtr, window, GWL_STYLE, WS_CHILD));
   } else {
-    ::SetWindowLongPtr(window, GWL_STYLE, WS_CHILD | WS_CLIPCHILDREN |
-                       WS_CLIPSIBLINGS);
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        NewRunnableFunction(::SetWindowLongPtr, window, GWL_STYLE,
+                            WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS));
   }
-  ::SetParent(window, parent);
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      NewRunnableFunction(::SetParent, window, parent));

[cpu_(ooo_6.6-7.5), 2011/06/08 18:04:31]

Is not easier to just make a single function that does all the 3 things and call
it via PostTask?

[ananta, 2011/06/08 18:10:47]

Done.

 }
 #endif  // defined(OS_WIN)
 
 #if defined(TOOLKIT_USES_GTK)
 void PluginProcessHost::OnMapNativeViewId(gfx::NativeViewId id,
                                           gfx::PluginWindowHandle* output) {
   *output = 0;
   GtkNativeViewManager::GetInstance()->GetXIDForId(output, id);
 }
 #endif  // defined(TOOLKIT_USES_GTK)
@@ skipping 254 matching lines @@
   }
 }
 
 void PluginProcessHost::OnChannelCreated(
     const IPC::ChannelHandle& channel_handle) {
   Client* client = sent_requests_.front();
 
   client->OnChannelOpened(channel_handle);
   sent_requests_.pop();
 }