Title: [87624] trunk/Source/WebKit2
- Revision
- 87624
- Author
- [email protected]
- Date
- 2011-05-28 13:39:23 -0700 (Sat, 28 May 2011)
Log Message
2011-05-28 Anders Carlsson <[email protected]>
Reviewed by Dan Bernstein.
REGRESSION (r86578): Flash content missing from mercurynews.com
https://bugs.webkit.org/show_bug.cgi?id=61691
<rdar://problem/9519893>
If the plug-in doesn't have access to the toplevel URL, make sure to
return *something* to the plug-in.
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::tryToShortCircuitInvoke):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (87623 => 87624)
--- trunk/Source/WebKit2/ChangeLog 2011-05-28 19:59:16 UTC (rev 87623)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-28 20:39:23 UTC (rev 87624)
@@ -1,3 +1,17 @@
+2011-05-28 Anders Carlsson <[email protected]>
+
+ Reviewed by Dan Bernstein.
+
+ REGRESSION (r86578): Flash content missing from mercurynews.com
+ https://bugs.webkit.org/show_bug.cgi?id=61691
+ <rdar://problem/9519893>
+
+ If the plug-in doesn't have access to the toplevel URL, make sure to
+ return *something* to the plug-in.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::tryToShortCircuitInvoke):
+
2011-05-28 Adam Barth <[email protected]>
Reviewed by Alexey Proskuryakov.
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (87623 => 87624)
--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-05-28 19:59:16 UTC (rev 87623)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-05-28 20:39:23 UTC (rev 87624)
@@ -323,7 +323,10 @@
if (!strcmp(methodNameRep->string(), "__flash_getTopLocation")) {
if (m_pluginCreationParameters->parameters.toplevelDocumentURL.isNull()) {
// If the toplevel document is URL it means that the frame that the plug-in is in doesn't have access to the toplevel document.
- returnValue = false;
+ // In this case, just pass the string "[object]" to Flash.
+ result.type = NPVariantType_String;
+ result.value.stringValue = createNPString("[object]");
+ returnValue = true;
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
