Fix plugin hang that Earth team found.

Normally an NPObjectProxy uses the modal dialog event to figure out when it needs to pump window messages in an invoke.  However, an NPObjectProxy created by an NPObjectStub never got access to this event, which led to this hang.

BUG=7793
Review URL: http://codereview.chromium.org/20515

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10145 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h
index 653a400..cd75853 100644
--- a/chrome/plugin/npobject_stub.h
+++ b/chrome/plugin/npobject_stub.h
@@ -13,6 +13,10 @@
 #include "base/ref_counted.h"
 #include "chrome/common/ipc_channel.h"
 
+namespace base {
+class WaitableEvent;
+}
+
 class PluginChannelBase;
 class WebPluginDelegateProxy;
 struct NPIdentifier_Param;
@@ -25,7 +29,10 @@ struct NPVariant_Param;
 class NPObjectStub : public IPC::Channel::Listener,
                      public IPC::Message::Sender {
  public:
-  NPObjectStub(NPObject* npobject, PluginChannelBase* channel, int route_id);
+  NPObjectStub(NPObject* npobject,
+               PluginChannelBase* channel,
+               int route_id,
+               base::WaitableEvent* modal_dialog_event);
   ~NPObjectStub();
 
   // IPC::Message::Sender implementation:
@@ -74,6 +81,8 @@ class NPObjectStub : public IPC::Channel::Listener,
   int route_id_;
   scoped_refptr<PluginChannelBase> channel_;
 
+  base::WaitableEvent* modal_dialog_event_;
+
   // These variables are used to ensure that the window script object is not
   // called after the plugin widget has gone away, as the frame manually
   // deallocates it and ignores the refcount to avoid leaks.