[Lion WK2] fast/loader/reload-zero-byte-plugin.html hits assert

https://bugs.webkit.org/show_bug.cgi?id=89611
<rdar://problem/11714023>

Reviewed by Sam Weinig.

Source/WebKit2:

Make sure to send the response along to the plug-in in the case where the stream was empty.

* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::finishedLoading):

LayoutTests:

Remove the test from the Skipped list.

* platform/mac-wk2/Skipped:

Canonical link: https://commits.webkit.org/107773@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@121203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,15 @@
+2012-06-25  Anders Carlsson  <andersca@apple.com>
+
+        [Lion WK2] fast/loader/reload-zero-byte-plugin.html hits assert
+        https://bugs.webkit.org/show_bug.cgi?id=89611
+        <rdar://problem/11714023>
+
+        Reviewed by Sam Weinig.
+
+        Remove the test from the Skipped list.
+
+        * platform/mac-wk2/Skipped:
+
 2012-06-25  Dirk Pranke  <dpranke@chromium.org>
 
         remove chromium vista baselines

LayoutTests/platform/mac-wk2/Skipped

@@ -271,10 +271,6 @@ fast/canvas/canvas-createImageData.html
 # https://bugs.webkit.org/show_bug.cgi?id=89199
 editing/spelling/grammar-edit-word.html
 
-# PluginProcess crashes on WK2
-# https://bugs.webkit.org/show_bug.cgi?id=89611
-fast/loader/reload-zero-byte-plugin.html
-
 ### END OF (1) Classified failures with bug reports
 ########################################
 

Source/WebKit2/ChangeLog

@@ -1,3 +1,16 @@
+2012-06-25  Anders Carlsson  <andersca@apple.com>
+
+        [Lion WK2] fast/loader/reload-zero-byte-plugin.html hits assert
+        https://bugs.webkit.org/show_bug.cgi?id=89611
+        <rdar://problem/11714023>
+
+        Reviewed by Sam Weinig.
+
+        Make sure to send the response along to the plug-in in the case where the stream was empty.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::finishedLoading):
+
 2012-06-25  YoungTaeck Song  <youngtaeck.song@samsung.com>
 
         [WK2][Qt][EFL] Move LayerBackingStore into common directory

Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -907,8 +907,17 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* loader)
         }
     }
 
-    // Plugin view could have been created inside committedLoad().
     if (m_pluginView) {
+        // If we just received an empty response without any data, we won't have sent a response to the plug-in view.
+        // Make sure to do this before calling manualLoadDidFinishLoading.
+        if (!m_hasSentResponseToPluginView) {
+            m_pluginView->manualLoadDidReceiveResponse(loader->response());
+
+            // Protect against the above call nulling out the plug-in (by trying to cancel the load for example).
+            if (!m_pluginView)
+                return;
+        }
+
         m_pluginView->manualLoadDidFinishLoading();
         m_pluginView = 0;
         m_hasSentResponseToPluginView = false;