diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 19:58:15 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 19:58:15 +0000 |
| commit | 35bb14330bde78b7c29609eed27c24caf7c9cd96 (patch) | |
| tree | b68ac7272d45002568cbe3908ac713a5de8d0f86 /chrome/plugin/npobject_stub.h | |
| parent | 8327443a5a5808f784e5fdc693e6d6f1f1beb032 (diff) | |
| download | chromium_src-35bb14330bde78b7c29609eed27c24caf7c9cd96.zip chromium_src-35bb14330bde78b7c29609eed27c24caf7c9cd96.tar.gz chromium_src-35bb14330bde78b7c29609eed27c24caf7c9cd96.tar.bz2 | |
Attempt 2 at landing this patch. It broke the Mac/linux builds. Fix for now is
to add the offending code in np_v8object.cpp in a ifdef OS_WIN
This fixes http://code.google.com/p/chromium/issues/detail?id=2472, which
is an issue with popups displayed by the flash plugin in response to a user
click, getting blocked.
The plugin invokes NPN_Evaluate to execute the javascript. It also invokes
the NPN_PushPopupEnabledState/NPN_PopupEnabledState API's to set the popup
enabled stack for the duration of the call.
The fix is to add the plumbing in NPN_Evaluate to pass in a flag indicating
whether popups are allowed for the duration of the call.
Bug=2472
R=jam
Review URL: http://codereview.chromium.org/6379
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/npobject_stub.h')
| -rw-r--r-- | chrome/plugin/npobject_stub.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h index e5f1743..a309750 100644 --- a/chrome/plugin/npobject_stub.h +++ b/chrome/plugin/npobject_stub.h @@ -63,7 +63,8 @@ class NPObjectStub : public IPC::Channel::Listener, void OnInvalidate(); void OnEnumeration(std::vector<NPIdentifier_Param>* value, bool* result); - void OnEvaluate(const std::string& script, IPC::Message* reply_msg); + void OnEvaluate(const std::string& script, bool popups_allowed, + IPC::Message* reply_msg); void OnSetException(const std::string& message); private: |