Changeset 86259 in webkit

Timestamp:

May 11, 2011 1:30:01 PM (13 years ago)

Author:

Adam Roben

Message:

Don't notify the plugin when a targeted javascript: URL request completes

This matches Mozilla and WebKit1.

Fixes <​http://webkit.org/b/60568> <rdar://problem/8610657> REGRESSION (WebKit2): Flash
plugin doesn't appear on a hanes.com page

Test: plugins/get-targeted-javascript-url.html

Reviewed by Anders Carlsson.

Source/WebKit2:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::performJavaScriptURLRequest): Don't call back to the plugin if the
request had a target.

LayoutTests:

Test what happens when a plugin makes a targeted javascript: request

• plugins/get-targeted-javascript-url-expected.txt: Added.
• plugins/get-targeted-javascript-url.html: Added.

(startTest): Tell the plugin to make two targeted javascript: requests. One calls a function
with a return value, the other calls a function with no return value.
(finishTest): Check that both functions were called, and that we either didn't get an
NPP_URLNotify call (like in Mozilla, WebKit1, and WebKit2), or got an NPP_URLNotify call
with NPRES_DONE (like in Chrome).

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/get-targeted-javascript-url-expected.txt (added)
• LayoutTests/plugins/get-targeted-javascript-url.html (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-11  Adam Roben  <aroben@apple.com>
+
+        Test what happens when a plugin makes a targeted javascript: request
+
+        Test for <http://webkit.org/b/60568> <rdar://problem/8610657> REGRESSION (WebKit2): Flash
+        plugin doesn't appear on a hanes.com page
+
+        Reviewed by Anders Carlsson.
+
+        * plugins/get-targeted-javascript-url-expected.txt: Added.
+        * plugins/get-targeted-javascript-url.html: Added.
+        (startTest): Tell the plugin to make two targeted javascript: requests. One calls a function
+        with a return value, the other calls a function with no return value.
+        (finishTest): Check that both functions were called, and that we either didn't get an
+        NPP_URLNotify call (like in Mozilla, WebKit1, and WebKit2), or got an NPP_URLNotify call
+        with NPRES_DONE (like in Chrome).
+
 2011-05-11  Kenji Imasaki  <imasaki@chromium.org>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-11  Adam Roben  <aroben@apple.com>
+
+        Don't notify the plugin when a targeted javascript: URL request completes
+
+        This matches Mozilla and WebKit1.
+
+        Fixes <http://webkit.org/b/60568> <rdar://problem/8610657> REGRESSION (WebKit2): Flash
+        plugin doesn't appear on a hanes.com page
+
+        Test: plugins/get-targeted-javascript-url.html
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::performJavaScriptURLRequest): Don't call back to the plugin if the
+        request had a target.
+
 2011-05-11  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -782 +782 @@
         return;
 
+    // Don't notify the plug-in at all about targeted javascript: requests. This matches Mozilla and WebKit1.
+    if (!request->target().isNull())
+        return;
+
     ScriptState* scriptState = frame->script()->globalObject(pluginWorld())->globalExec();
     String resultString;
     result.getString(scriptState, resultString);
   
-    if (!request->target().isNull()) {
-        // Just send back whether the frame load succeeded or not.
-        if (resultString.isNull())
-            m_plugin->frameDidFail(request->requestID(), false);
-        else
-            m_plugin->frameDidFinishLoading(request->requestID());
-        return;
-    }
-
     // Send the result back to the plug-in.
     plugin->didEvaluateJavaScript(request->requestID(), decodeURLEscapeSequences(request->request().url()), resultString);