Title: [176905] trunk
- Revision
- 176905
- Author
- [email protected]
- Date
- 2014-12-06 02:39:51 -0800 (Sat, 06 Dec 2014)
Log Message
REGRESSION (173394): Support for webcam is broken
https://bugs.webkit.org/show_bug.cgi?id=139313
Reviewed by Alexey Proskuryakov.
Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didReceiveResponseAsync):
Don't buffer when handling multipart/x-mixed-replace. Multiple calls to didReceiveResponseAsync break assumptions.
LayoutTests:
We had no coverage for actually rendering multipart content.
* http/tests/multipart/multipart-image-expected.html: Added.
* http/tests/multipart/multipart-image.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (176904 => 176905)
--- trunk/LayoutTests/ChangeLog 2014-12-06 05:44:10 UTC (rev 176904)
+++ trunk/LayoutTests/ChangeLog 2014-12-06 10:39:51 UTC (rev 176905)
@@ -1,3 +1,15 @@
+2014-12-05 Antti Koivisto <[email protected]>
+
+ REGRESSION (173394): Support for webcam is broken
+ https://bugs.webkit.org/show_bug.cgi?id=139313
+
+ Reviewed by Alexey Proskuryakov.
+
+ We had no coverage for actually rendering multipart content.
+
+ * http/tests/multipart/multipart-image-expected.html: Added.
+ * http/tests/multipart/multipart-image.html: Added.
+
2014-12-05 Chris Fleizach <[email protected]>
AX: I cannot activate links on the mobile version of news.google.com
Added: trunk/LayoutTests/http/tests/multipart/multipart-image-expected.html (0 => 176905)
--- trunk/LayoutTests/http/tests/multipart/multipart-image-expected.html (rev 0)
+++ trunk/LayoutTests/http/tests/multipart/multipart-image-expected.html 2014-12-06 10:39:51 UTC (rev 176905)
@@ -0,0 +1 @@
+<img src=""
Added: trunk/LayoutTests/http/tests/multipart/multipart-image.html (0 => 176905)
--- trunk/LayoutTests/http/tests/multipart/multipart-image.html (rev 0)
+++ trunk/LayoutTests/http/tests/multipart/multipart-image.html 2014-12-06 10:39:51 UTC (rev 176905)
@@ -0,0 +1,27 @@
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+function loadedFirstPart()
+{
+ if (!window.testRunner)
+ return;
+ var count = 0;
+ setInterval(function() {
+ var img = document.getElementById("test");
+ /* width of abe.png */
+ if (img.offsetWidth == 76)
+ testRunner.notifyDone();
+ if (++count > 20)
+ testRunner.notifyDone();
+ }, 100);
+}
+</script>
+</head>
+<body>
+<!-- The last image is repeated due to a WebCore side bug that causes last part to not render. -->
+<img id=test src="" _onload_="loadedFirstPart()">
+</body>
+</html>
Modified: trunk/Source/WebKit2/ChangeLog (176904 => 176905)
--- trunk/Source/WebKit2/ChangeLog 2014-12-06 05:44:10 UTC (rev 176904)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-06 10:39:51 UTC (rev 176905)
@@ -1,3 +1,15 @@
+2014-12-05 Antti Koivisto <[email protected]>
+
+ REGRESSION (173394): Support for webcam is broken
+ https://bugs.webkit.org/show_bug.cgi?id=139313
+
+ Reviewed by Alexey Proskuryakov.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didReceiveResponseAsync):
+
+ Don't buffer when handling multipart/x-mixed-replace. Multiple calls to didReceiveResponseAsync break assumptions.
+
2014-12-05 Yongjun Zhang <[email protected]>
Add a delegate method for didReceiveServerRedirectForProvisionalLoadForFrame.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (176904 => 176905)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-12-06 05:44:10 UTC (rev 176904)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-12-06 10:39:51 UTC (rev 176905)
@@ -198,6 +198,10 @@
if (isSynchronous())
m_synchronousLoadData->response = response;
else {
+ // For multipart/x-mixed-replace didReceiveResponseAsync gets called multiple times and buffering would require special handling.
+ if (response.isMultipart())
+ m_bufferedData = nullptr;
+
if (!sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(response, m_parameters.isMainResource)))
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
