Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7353)

Unified Diff: chrome/plugin/npobject_stub.h

Issue 20515: Fix plugin hang that Earth team found.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/plugin/npobject_proxy.cc ('k') | chrome/plugin/npobject_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/npobject_stub.h
===================================================================
--- chrome/plugin/npobject_stub.h (revision 10079)
+++ chrome/plugin/npobject_stub.h (working copy)
@@ -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 @@
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 @@
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.
« no previous file with comments | « chrome/plugin/npobject_proxy.cc ('k') | chrome/plugin/npobject_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698