summaryrefslogtreecommitdiffstats
path: root/chrome/common/plugin_messages_internal.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 19:58:15 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 19:58:15 +0000
commit35bb14330bde78b7c29609eed27c24caf7c9cd96 (patch)
treeb68ac7272d45002568cbe3908ac713a5de8d0f86 /chrome/common/plugin_messages_internal.h
parent8327443a5a5808f784e5fdc693e6d6f1f1beb032 (diff)
downloadchromium_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/common/plugin_messages_internal.h')
-rw-r--r--chrome/common/plugin_messages_internal.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/common/plugin_messages_internal.h b/chrome/common/plugin_messages_internal.h
index 146cd9c..1059418 100644
--- a/chrome/common/plugin_messages_internal.h
+++ b/chrome/common/plugin_messages_internal.h
@@ -301,8 +301,9 @@ IPC_BEGIN_MESSAGES(NPObject, 7)
std::vector<NPIdentifier_Param> /* value */,
bool /* result */)
- IPC_SYNC_MESSAGE_ROUTED1_2(NPObjectMsg_Evaluate,
+ IPC_SYNC_MESSAGE_ROUTED2_2(NPObjectMsg_Evaluate,
std::string /* script */,
+ bool /* popups_allowed */,
NPVariant_Param /* result_param */,
bool /* result */)