Fix the deadlock when Flash tries to make WMP full screen. This is a one-off...

chrome/plugin/npobject_stub.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/plugin/npobject_stub.h"
 
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel_base.h"
+#include "chrome/plugin/plugin_thread.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "webkit/api/public/WebBindings.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
 
 using WebKit::WebBindings;
 
 NPObjectStub::NPObjectStub(
     NPObject* npobject,
     PluginChannelBase* channel,
     int route_id,
     base::WaitableEvent* modal_dialog_event,
     const GURL& page_url)
     : npobject_(npobject),
@@ skipping 36 matching lines @@
 
     return;
   }
 
   IPC_BEGIN_MESSAGE_MAP(NPObjectStub, msg)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NPObjectMsg_Release, OnRelease);
     IPC_MESSAGE_HANDLER(NPObjectMsg_HasMethod, OnHasMethod);
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NPObjectMsg_Invoke, OnInvoke);
     IPC_MESSAGE_HANDLER(NPObjectMsg_HasProperty, OnHasProperty);
     IPC_MESSAGE_HANDLER(NPObjectMsg_GetProperty, OnGetProperty);
-    IPC_MESSAGE_HANDLER(NPObjectMsg_SetProperty, OnSetProperty);
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(NPObjectMsg_SetProperty, OnSetProperty);
     IPC_MESSAGE_HANDLER(NPObjectMsg_RemoveProperty, OnRemoveProperty);
     IPC_MESSAGE_HANDLER(NPObjectMsg_Invalidate, OnInvalidate);
     IPC_MESSAGE_HANDLER(NPObjectMsg_Enumeration, OnEnumeration);
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NPObjectMsg_Construct, OnConstruct);
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NPObjectMsg_Evaluate, OnEvaluate);
     IPC_MESSAGE_HANDLER(NPObjectMsg_SetException, OnSetException);
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 }
 
@@ skipping 116 matching lines @@
   } else {
     *result = WebBindings::getProperty(0, npobject_, id, &result_var);
   }
 
   CreateNPVariantParam(
       result_var, channel_, property, true, modal_dialog_event_, page_url_);
 }
 
 void NPObjectStub::OnSetProperty(const NPIdentifier_Param& name,
                                  const NPVariant_Param& property,
-                                 bool* result) {
+                                 IPC::Message* reply_msg) {
+  bool result;
   NPVariant result_var;
   VOID_TO_NPVARIANT(result_var);
   NPIdentifier id = CreateNPIdentifier(name);
   NPVariant property_var;
   CreateNPVariant(
       property, channel_, &property_var, modal_dialog_event_, page_url_);
 
   if (IsPluginProcess()) {
     if (npobject_->_class->setProperty) {
-      *result = npobject_->_class->setProperty(npobject_, id, &property_var);
+#if defined(OS_WIN)
+      static std::wstring filename = StringToLowerASCII(
+          PluginThread::current()->plugin_path().BaseName().value());
+      static NPIdentifier fullscreen =
+          WebBindings::getStringIdentifier("fullScreen");
+      if (filename == kNewWMPPlugin && id == fullscreen) {
+        // Workaround for bug 15985, which is if Flash causes WMP to go
+        // full screen a deadlock can occur when WMP calls SetFocus.
+        NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, true);
+        Send(reply_msg);
+        reply_msg = NULL;
+      }
+#endif
+      result = npobject_->_class->setProperty(npobject_, id, &property_var);
     } else {
-      *result = false;
+      result = false;
     }
   } else {
-    *result = WebBindings::setProperty(0, npobject_, id, &property_var);
+    result = WebBindings::setProperty(0, npobject_, id, &property_var);
   }
 
   WebBindings::releaseVariantValue(&property_var);
+
+  if (reply_msg) {
+    NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, result);
+    Send(reply_msg);
+  }
 }
 
 void NPObjectStub::OnRemoveProperty(const NPIdentifier_Param& name,
                                     bool* result) {
   NPIdentifier id = CreateNPIdentifier(name);
   if (IsPluginProcess()) {
     if (npobject_->_class->removeProperty) {
       *result = npobject_->_class->removeProperty(npobject_, id);
     } else {
       *result = false;
@@ skipping 113 matching lines @@
 }
 
 void NPObjectStub::OnSetException(const std::string& message) {
   if (IsPluginProcess()) {
     NOTREACHED() << "Should only be called on NPObjects in the renderer";
     return;
   }
 
   WebBindings::setException(npobject_, message.c_str());
 }