Title: [121203] trunk
- Revision
- 121203
- Author
- [email protected]
- Date
- 2012-06-25 17:43:47 -0700 (Mon, 25 Jun 2012)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121202 => 121203)
--- trunk/LayoutTests/ChangeLog 2012-06-26 00:31:21 UTC (rev 121202)
+++ trunk/LayoutTests/ChangeLog 2012-06-26 00:43:47 UTC (rev 121203)
@@ -1,3 +1,15 @@
+2012-06-25 Anders Carlsson <[email protected]>
+
+ [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 <[email protected]>
remove chromium vista baselines
Modified: trunk/LayoutTests/platform/mac-wk2/Skipped (121202 => 121203)
--- trunk/LayoutTests/platform/mac-wk2/Skipped 2012-06-26 00:31:21 UTC (rev 121202)
+++ trunk/LayoutTests/platform/mac-wk2/Skipped 2012-06-26 00:43:47 UTC (rev 121203)
@@ -271,10 +271,6 @@
# 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
########################################
Modified: trunk/Source/WebKit2/ChangeLog (121202 => 121203)
--- trunk/Source/WebKit2/ChangeLog 2012-06-26 00:31:21 UTC (rev 121202)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-26 00:43:47 UTC (rev 121203)
@@ -1,3 +1,16 @@
+2012-06-25 Anders Carlsson <[email protected]>
+
+ [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 <[email protected]>
[WK2][Qt][EFL] Move LayerBackingStore into common directory
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (121202 => 121203)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-06-26 00:31:21 UTC (rev 121202)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2012-06-26 00:43:47 UTC (rev 121203)
@@ -907,8 +907,17 @@
}
}
- // 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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
