<!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>[151013] trunk/Source/WebCore</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/151013">151013</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-31 03:25:08 -0700 (Fri, 31 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Soup] [Gstreamer] ASSERT in StreamingClient::getOrCreateReadBuffer
https://bugs.webkit.org/show_bug.cgi?id=116686

Patch by Alberto Garcia &lt;agarcia@igalia.com&gt; on 2013-05-31
Reviewed by Carlos Garcia Campos.

We were using g_input_stream_read_async() to handle redirections
because of Gnome bug #691489.

This produces an unexpected read attempt which triggers an assert
in StreamingClient::getOrCreateReadBuffer().

Now that the Gnome bug is fixed we can replace read_async() with
skip_async().

* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::ensureReadBuffer):
(WebCore::redirectSkipCallback):
(WebCore::sendRequestCallback):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (151012 => 151013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-31 10:06:32 UTC (rev 151012)
+++ trunk/Source/WebCore/ChangeLog        2013-05-31 10:25:08 UTC (rev 151013)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-05-31  Alberto Garcia  &lt;agarcia@igalia.com&gt;
+
+        [Soup] [Gstreamer] ASSERT in StreamingClient::getOrCreateReadBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=116686
+
+        Reviewed by Carlos Garcia Campos.
+
+        We were using g_input_stream_read_async() to handle redirections
+        because of Gnome bug #691489.
+
+        This produces an unexpected read attempt which triggers an assert
+        in StreamingClient::getOrCreateReadBuffer().
+
+        Now that the Gnome bug is fixed we can replace read_async() with
+        skip_async().
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::ensureReadBuffer):
+        (WebCore::redirectSkipCallback):
+        (WebCore::sendRequestCallback):
+
</ins><span class="cx"> 2013-05-30  Eugene Klyuchnikov  &lt;eustas@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         selectionStart/selectionEnd return &quot;obsolete&quot; values when requested during &quot;input&quot; event
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (151012 => 151013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2013-05-31 10:06:32 UTC (rev 151012)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2013-05-31 10:25:08 UTC (rev 151013)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static bool loadingSynchronousRequest = false;
</span><ins>+static const size_t defaultReadBufferSize = 8192;
</ins><span class="cx"> 
</span><span class="cx"> class WebCoreSynchronousLoader : public ResourceHandleClient {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(WebCoreSynchronousLoader);
</span><span class="lines">@@ -306,7 +307,6 @@
</span><span class="cx"> {
</span><span class="cx">     ResourceHandleInternal* d = getInternal();
</span><span class="cx"> 
</span><del>-    static const size_t defaultReadBufferSize = 8192;
</del><span class="cx">     size_t bufferSize;
</span><span class="cx">     char* bufferPtr = client()-&gt;getOrCreateReadBuffer(defaultReadBufferSize, bufferSize);
</span><span class="cx">     if (bufferPtr) {
</span><span class="lines">@@ -524,7 +524,7 @@
</span><span class="cx"> 
</span><span class="cx">     GOwnPtr&lt;GError&gt; error;
</span><span class="cx">     ResourceHandleInternal* d = handle-&gt;getInternal();
</span><del>-    gssize bytesSkipped = g_input_stream_read_finish(d-&gt;m_inputStream.get(), asyncResult, &amp;error.outPtr());
</del><ins>+    gssize bytesSkipped = g_input_stream_skip_finish(d-&gt;m_inputStream.get(), asyncResult, &amp;error.outPtr());
</ins><span class="cx">     if (error) {
</span><span class="cx">         handle-&gt;client()-&gt;didFail(handle.get(), ResourceError::genericGError(error.get(), d-&gt;m_soupRequest.get()));
</span><span class="cx">         cleanupSoupRequestOperation(handle.get());
</span><span class="lines">@@ -532,8 +532,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (bytesSkipped &gt; 0) {
</span><del>-        handle-&gt;ensureReadBuffer();
-        g_input_stream_read_async(d-&gt;m_inputStream.get(), d-&gt;m_readBufferPtr, d-&gt;m_readBufferSize, G_PRIORITY_DEFAULT,
</del><ins>+        g_input_stream_skip_async(d-&gt;m_inputStream.get(), defaultReadBufferSize, G_PRIORITY_DEFAULT,
</ins><span class="cx">             d-&gt;m_cancellable.get(), redirectSkipCallback, handle.get());
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -683,11 +682,7 @@
</span><span class="cx">     if (soupMessage) {
</span><span class="cx">         if (SOUP_STATUS_IS_REDIRECTION(soupMessage-&gt;status_code) &amp;&amp; shouldRedirect(handle.get())) {
</span><span class="cx">             d-&gt;m_inputStream = inputStream;
</span><del>-            // We use read_async() rather than skip_async() to work around
-            // https://bugzilla.gnome.org/show_bug.cgi?id=691489 until we can
-            // depend on glib &gt; 2.35.4
-            handle-&gt;ensureReadBuffer();
-            g_input_stream_read_async(d-&gt;m_inputStream.get(), d-&gt;m_readBufferPtr, d-&gt;m_readBufferSize, G_PRIORITY_DEFAULT,
</del><ins>+            g_input_stream_skip_async(d-&gt;m_inputStream.get(), defaultReadBufferSize, G_PRIORITY_DEFAULT,
</ins><span class="cx">                 d-&gt;m_cancellable.get(), redirectSkipCallback, handle.get());
</span><span class="cx">             return;
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>