<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178326] releases/WebKitGTK/webkit-2.6</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178326">178326</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 00:54:01 -0800 (Tue, 13 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176905">r176905</a> - 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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2NetworkProcessNetworkResourceLoadercpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsmultipartmultipartimageexpectedhtml">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsmultipartmultipartimagehtml">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (178325 => 178326)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog        2015-01-13 08:49:19 UTC (rev 178325)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog        2015-01-13 08:54:01 UTC (rev 178326)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-05  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        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.
+
</ins><span class="cx"> 2014-12-05  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Directional single quotation marks are not rotated in vertical text
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsmultipartmultipartimageexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image-expected.html (0 => 178326)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image-expected.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image-expected.html        2015-01-13 08:54:01 UTC (rev 178326)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+&lt;img src=&quot;resources/abe.png&quot;&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsmultipartmultipartimagehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image.html (0 => 178326)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/multipart/multipart-image.html        2015-01-13 08:54:01 UTC (rev 178326)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.testRunner)
+    testRunner.waitUntilDone();
+
+function loadedFirstPart()
+{
+    if (!window.testRunner)
+        return;
+    var count = 0;
+    setInterval(function() {
+        var img = document.getElementById(&quot;test&quot;);
+        /* width of abe.png */
+        if (img.offsetWidth == 76)
+            testRunner.notifyDone();
+        if (++count &gt; 20)
+            testRunner.notifyDone();
+    }, 100);
+}
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;!-- The last image is repeated due to a WebCore side bug that causes last part to not render. --&gt;
+&lt;img id=test src=&quot;resources/multipart.php?interval=0.1&amp;img1=green-100x100.png&amp;img2=abe.png&amp;img3=abe.png&quot; onload=&quot;loadedFirstPart()&quot;&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (178325 => 178326)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog        2015-01-13 08:49:19 UTC (rev 178325)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog        2015-01-13 08:54:01 UTC (rev 178326)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-05  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        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.
+
</ins><span class="cx"> 2014-12-04  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r173468): Cannot step in WebInspector
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (178325 => 178326)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-01-13 08:49:19 UTC (rev 178325)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-01-13 08:54:01 UTC (rev 178326)
</span><span class="lines">@@ -198,8 +198,13 @@
</span><span class="cx"> 
</span><span class="cx">     if (isSynchronous())
</span><span class="cx">         m_synchronousLoadData-&gt;response = response;
</span><del>-    else
</del><ins>+    else {
+        // For multipart/x-mixed-replace didReceiveResponseAsync gets called multiple times and buffering would require special handling.
+        if (response.isMultipart())
+            m_bufferedData = nullptr;
+
</ins><span class="cx">         sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponse(response, m_parameters.isMainResource));
</span><ins>+    }
</ins><span class="cx"> 
</span><span class="cx">     // m_handle will be null if the request got aborted above.
</span><span class="cx">     if (!m_handle)
</span></span></pre>
</div>
</div>

</body>
</html>