Changeset 87632 in webkit

Timestamp:

May 28, 2011 7:46:00 PM (12 years ago)

Author:

mrowe@apple.com

Message:

Merge r87624.

Location:

branches/safari-534-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (1 diff)

branches/safari-534-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-28  Mark Rowe  <mrowe@apple.com>
+
+        Merge r87624.
+
+    2011-05-28  Anders Carlsson  <andersca@apple.com>
+
+        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  <mrowe@apple.com>
 

branches/safari-534-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -320 +320 @@
         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;
         }