From 35bb14330bde78b7c29609eed27c24caf7c9cd96 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Thu, 9 Oct 2008 19:58:15 +0000 Subject: 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 --- chrome/plugin/npobject_proxy.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'chrome/plugin/npobject_proxy.cc') diff --git a/chrome/plugin/npobject_proxy.cc b/chrome/plugin/npobject_proxy.cc index 1b464e0..9acde3d 100644 --- a/chrome/plugin/npobject_proxy.cc +++ b/chrome/plugin/npobject_proxy.cc @@ -324,12 +324,22 @@ bool NPObjectProxy::NPNEvaluate(NPP npp, return false; } + bool popups_allowed = false; + + if (npp) { + NPAPI::PluginInstance* plugin_instance = + reinterpret_cast(npp->ndata); + if (plugin_instance) + popups_allowed = plugin_instance->popups_allowed(); + } + NPVariant_Param result_param; std::string script_str = std::string( script->UTF8Characters, script->UTF8Length); NPObjectMsg_Evaluate* msg = new NPObjectMsg_Evaluate(proxy->route_id(), script_str, + popups_allowed, &result_param, &result); -- cgit v1.1