Title: [87632] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87631 => 87632)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-29 02:44:48 UTC (rev 87631)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-29 02:46:00 UTC (rev 87632)
@@ -1,5 +1,23 @@
2011-05-28 Mark Rowe <[email protected]>
+ Merge r87624.
+
+ 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 Mark Rowe <[email protected]>
+
Merge r87627.
2011-05-28 Simon Fraser <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (87631 => 87632)
--- branches/safari-534-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-05-29 02:44:48 UTC (rev 87631)
+++ branches/safari-534-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-05-29 02:46:00 UTC (rev 87632)
@@ -319,7 +319,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
