<!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>[198890] 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/198890">198890</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-03-31 03:31:28 -0700 (Thu, 31 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Fetch API] Move isDisturbed handling to FetchBodyOwner
https://bugs.webkit.org/show_bug.cgi?id=155968

Reviewed by Darin Adler.

Moved isDisturbed handling in FetchBodyOwner.
This includes promise rejection in case of disturbed bodies.

No behavior change observable from user scripts.

* Modules/fetch/FetchBody.cpp:
(WebCore::FetchBody::arrayBuffer):
(WebCore::FetchBody::blob):
(WebCore::FetchBody::json):
(WebCore::FetchBody::text):
(WebCore::FetchBody::extractFromBody):
(WebCore::FetchBody::consume):
(WebCore::FetchBody::consumeArrayBuffer):
(WebCore::FetchBody::processIfEmptyOrDisturbed): Deleted.
* Modules/fetch/FetchBody.h:
(WebCore::FetchBody::isEmpty): Deleted.
* Modules/fetch/FetchBodyOwner.cpp:
(WebCore::FetchBodyOwner::arrayBuffer):
(WebCore::FetchBodyOwner::blob):
(WebCore::FetchBodyOwner::formData):
(WebCore::FetchBodyOwner::json):
(WebCore::FetchBodyOwner::text):
* Modules/fetch/FetchBodyOwner.h:
(WebCore::FetchBodyOwner::isDisturbed):
(WebCore::FetchBodyOwner::setDisturbed):
* Modules/fetch/FetchRequest.cpp:
(WebCore::FetchRequest::create):
* Modules/fetch/FetchResponse.cpp:
(WebCore::FetchResponse::clone):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodycpp">trunk/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyh">trunk/Source/WebCore/Modules/fetch/FetchBody.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnercpp">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchBodyOwnerh">trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequestcpp">trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsecpp">trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198889 => 198890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-31 08:31:25 UTC (rev 198889)
+++ trunk/Source/WebCore/ChangeLog        2016-03-31 10:31:28 UTC (rev 198890)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2016-03-31  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><ins>+        [Fetch API] Move isDisturbed handling to FetchBodyOwner
+        https://bugs.webkit.org/show_bug.cgi?id=155968
+
+        Reviewed by Darin Adler.
+
+        Moved isDisturbed handling in FetchBodyOwner.
+        This includes promise rejection in case of disturbed bodies.
+
+        No behavior change observable from user scripts.
+
+        * Modules/fetch/FetchBody.cpp:
+        (WebCore::FetchBody::arrayBuffer):
+        (WebCore::FetchBody::blob):
+        (WebCore::FetchBody::json):
+        (WebCore::FetchBody::text):
+        (WebCore::FetchBody::extractFromBody):
+        (WebCore::FetchBody::consume):
+        (WebCore::FetchBody::consumeArrayBuffer):
+        (WebCore::FetchBody::processIfEmptyOrDisturbed): Deleted.
+        * Modules/fetch/FetchBody.h:
+        (WebCore::FetchBody::isEmpty): Deleted.
+        * Modules/fetch/FetchBodyOwner.cpp:
+        (WebCore::FetchBodyOwner::arrayBuffer):
+        (WebCore::FetchBodyOwner::blob):
+        (WebCore::FetchBodyOwner::formData):
+        (WebCore::FetchBodyOwner::json):
+        (WebCore::FetchBodyOwner::text):
+        * Modules/fetch/FetchBodyOwner.h:
+        (WebCore::FetchBodyOwner::isDisturbed):
+        (WebCore::FetchBodyOwner::setDisturbed):
+        * Modules/fetch/FetchRequest.cpp:
+        (WebCore::FetchRequest::create):
+        * Modules/fetch/FetchResponse.cpp:
+        (WebCore::FetchResponse::clone):
+
+2016-03-31  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
+
</ins><span class="cx">         Remove forEach use from Fetch Headers builtin constructor
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=155967
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (198889 => 198890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp        2016-03-31 08:31:25 UTC (rev 198889)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp        2016-03-31 10:31:28 UTC (rev 198890)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;DOMRequestState.h&quot;
</span><span class="cx"> #include &quot;Dictionary.h&quot;
</span><del>-#include &quot;ExceptionCode.h&quot;
</del><span class="cx"> #include &quot;FetchBodyOwner.h&quot;
</span><span class="cx"> #include &quot;FormData.h&quot;
</span><span class="cx"> #include &quot;HTTPParsers.h&quot;
</span><span class="lines">@@ -82,60 +81,24 @@
</span><span class="cx">     if (!body)
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><del>-    body-&gt;m_isDisturbed = true;
</del><span class="cx">     return FetchBody(WTFMove(*body));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool FetchBody::processIfEmptyOrDisturbed(Consumer::Type type, DeferredWrapper&amp; promise)
-{
-    if (m_type == Type::None) {
-        switch (type) {
-        case Consumer::Type::Text:
-            promise.resolve(String());
-            return true;
-        case Consumer::Type::Blob:
-            promise.resolve&lt;RefPtr&lt;Blob&gt;&gt;(Blob::create());
-            return true;
-        case Consumer::Type::JSON:
-            promise.reject&lt;ExceptionCode&gt;(SYNTAX_ERR);
-            return true;
-        case Consumer::Type::ArrayBuffer:
-            fulfillPromiseWithArrayBuffer(promise, nullptr, 0);
-            return true;
-        default:
-            ASSERT_NOT_REACHED();
-            promise.reject&lt;ExceptionCode&gt;(0);
-            return true;
-        };
-    }
-
-    if (m_isDisturbed) {
-        promise.reject&lt;ExceptionCode&gt;(TypeError);
-        return true;
-    }
-    m_isDisturbed = true;
-    return false;
-}
-
</del><span class="cx"> void FetchBody::arrayBuffer(FetchBodyOwner&amp; owner, DeferredWrapper&amp;&amp; promise)
</span><span class="cx"> {
</span><del>-    if (processIfEmptyOrDisturbed(Consumer::Type::ArrayBuffer, promise))
-        return;
</del><ins>+    ASSERT(m_type != Type::None);
</ins><span class="cx">     consume(owner, Consumer::Type::ArrayBuffer, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FetchBody::blob(FetchBodyOwner&amp; owner, DeferredWrapper&amp;&amp; promise)
</span><span class="cx"> {
</span><del>-    if (processIfEmptyOrDisturbed(Consumer::Type::Blob, promise))
-        return;
-
</del><ins>+    ASSERT(m_type != Type::None);
</ins><span class="cx">     consume(owner, Consumer::Type::Blob, WTFMove(promise));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FetchBody::json(FetchBodyOwner&amp; owner, DeferredWrapper&amp;&amp; promise)
</span><span class="cx"> {
</span><del>-    if (processIfEmptyOrDisturbed(Consumer::Type::JSON, promise))
-        return;
</del><ins>+    ASSERT(m_type != Type::None);
</ins><span class="cx"> 
</span><span class="cx">     if (m_type == Type::Text) {
</span><span class="cx">         fulfillPromiseWithJSON(promise, m_text);
</span><span class="lines">@@ -146,8 +109,7 @@
</span><span class="cx"> 
</span><span class="cx"> void FetchBody::text(FetchBodyOwner&amp; owner, DeferredWrapper&amp;&amp; promise)
</span><span class="cx"> {
</span><del>-    if (processIfEmptyOrDisturbed(Consumer::Type::Text, promise))
-        return;
</del><ins>+    ASSERT(m_type != Type::None);
</ins><span class="cx"> 
</span><span class="cx">     if (m_type == Type::Text) {
</span><span class="cx">         promise.resolve(m_text);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (198889 => 198890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h        2016-03-31 08:31:25 UTC (rev 198889)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h        2016-03-31 10:31:28 UTC (rev 198890)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx">     void text(FetchBodyOwner&amp;, DeferredWrapper&amp;&amp;);
</span><span class="cx">     void formData(FetchBodyOwner&amp;, DeferredWrapper&amp;&amp; promise) { promise.reject&lt;ExceptionCode&gt;(0); }
</span><span class="cx"> 
</span><del>-    bool isDisturbed() const { return m_isDisturbed; }
</del><span class="cx">     bool isEmpty() const { return m_type == Type::None; }
</span><span class="cx"> 
</span><span class="cx">     void setMimeType(const String&amp; mimeType) { m_mimeType = mimeType; }
</span><span class="lines">@@ -88,7 +87,6 @@
</span><span class="cx">     void consume(FetchBodyOwner&amp;, Consumer::Type, DeferredWrapper&amp;&amp;);
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;uint8_t&gt; extractFromText() const;
</span><del>-    bool processIfEmptyOrDisturbed(Consumer::Type, DeferredWrapper&amp;);
</del><span class="cx">     void consumeArrayBuffer(Consumer::Type, DeferredWrapper&amp;);
</span><span class="cx">     void consumeText(Consumer::Type, DeferredWrapper&amp;);
</span><span class="cx">     void consumeBlob(FetchBodyOwner&amp;, Consumer::Type, DeferredWrapper&amp;&amp;);
</span><span class="lines">@@ -98,7 +96,6 @@
</span><span class="cx"> 
</span><span class="cx">     Type m_type { Type::None };
</span><span class="cx">     String m_mimeType;
</span><del>-    bool m_isDisturbed { false };
</del><span class="cx"> 
</span><span class="cx">     // FIXME: Add support for BufferSource and URLSearchParams.
</span><span class="cx">     RefPtr&lt;Blob&gt; m_blob;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (198889 => 198890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp        2016-03-31 08:31:25 UTC (rev 198889)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp        2016-03-31 10:31:28 UTC (rev 198890)
</span><span class="lines">@@ -31,7 +31,9 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx"> 
</span><ins>+#include &quot;ExceptionCode.h&quot;
</ins><span class="cx"> #include &quot;FetchLoader.h&quot;
</span><ins>+#include &quot;JSBlob.h&quot;
</ins><span class="cx"> #include &quot;ResourceResponse.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -53,10 +55,80 @@
</span><span class="cx">     ASSERT(!m_blobLoader);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void FetchBodyOwner::arrayBuffer(DeferredWrapper&amp;&amp; promise)
+{
+    if (m_body.isEmpty()) {
+        fulfillPromiseWithArrayBuffer(promise, nullptr, 0);
+        return;
+    }
+    if (isDisturbed()) {
+        promise.reject&lt;ExceptionCode&gt;(TypeError);
+        return;
+    }
+    m_isDisturbed = true;
+    m_body.arrayBuffer(*this, WTFMove(promise));
+}
+
+void FetchBodyOwner::blob(DeferredWrapper&amp;&amp; promise)
+{
+    if (m_body.isEmpty()) {
+        promise.resolve&lt;RefPtr&lt;Blob&gt;&gt;(Blob::create());
+        return;
+    }
+    if (isDisturbed()) {
+        promise.reject&lt;ExceptionCode&gt;(TypeError);
+        return;
+    }
+    m_isDisturbed = true;
+    m_body.blob(*this, WTFMove(promise));
+}
+
+void FetchBodyOwner::formData(DeferredWrapper&amp;&amp; promise)
+{
+    if (m_body.isEmpty()) {
+        promise.reject&lt;ExceptionCode&gt;(0);
+        return;
+    }
+    if (isDisturbed()) {
+        promise.reject&lt;ExceptionCode&gt;(TypeError);
+        return;
+    }
+    m_isDisturbed = true;
+    m_body.formData(*this, WTFMove(promise));
+}
+
+void FetchBodyOwner::json(DeferredWrapper&amp;&amp; promise)
+{
+    if (m_body.isEmpty()) {
+        promise.reject&lt;ExceptionCode&gt;(SYNTAX_ERR);
+        return;
+    }
+    if (isDisturbed()) {
+        promise.reject&lt;ExceptionCode&gt;(TypeError);
+        return;
+    }
+    m_isDisturbed = true;
+    m_body.json(*this, WTFMove(promise));
+}
+
+void FetchBodyOwner::text(DeferredWrapper&amp;&amp; promise)
+{
+    if (m_body.isEmpty()) {
+        promise.resolve(String());
+        return;
+    }
+    if (isDisturbed()) {
+        promise.reject&lt;ExceptionCode&gt;(TypeError);
+        return;
+    }
+    m_isDisturbed = true;
+    m_body.text(*this, WTFMove(promise));
+}
+
</ins><span class="cx"> void FetchBodyOwner::loadBlob(Blob&amp; blob, FetchLoader::Type type)
</span><span class="cx"> {
</span><span class="cx">     // Can only be called once for a body instance.
</span><del>-    ASSERT(m_body.isDisturbed());
</del><ins>+    ASSERT(isDisturbed());
</ins><span class="cx">     ASSERT(!m_blobLoader);
</span><span class="cx"> 
</span><span class="cx">     if (!scriptExecutionContext()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (198889 => 198890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h        2016-03-31 08:31:25 UTC (rev 198889)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h        2016-03-31 10:31:28 UTC (rev 198890)
</span><span class="lines">@@ -43,13 +43,14 @@
</span><span class="cx">     FetchBodyOwner(ScriptExecutionContext&amp;, FetchBody&amp;&amp;);
</span><span class="cx"> 
</span><span class="cx">     // Exposed Body API
</span><del>-    bool isDisturbed() const { return m_body.isDisturbed(); }
-    void arrayBuffer(DeferredWrapper&amp;&amp; promise) { m_body.arrayBuffer(*this, WTFMove(promise)); }
-    void blob(DeferredWrapper&amp;&amp; promise) { m_body.blob(*this, WTFMove(promise)); }
-    void formData(DeferredWrapper&amp;&amp; promise) { m_body.formData(*this, WTFMove(promise)); }
-    void json(DeferredWrapper&amp;&amp; promise) { m_body.json(*this, WTFMove(promise)); }
-    void text(DeferredWrapper&amp;&amp; promise) { m_body.text(*this, WTFMove(promise)); }
</del><ins>+    bool isDisturbed() const { return m_isDisturbed; }
</ins><span class="cx"> 
</span><ins>+    void arrayBuffer(DeferredWrapper&amp;&amp;);
+    void blob(DeferredWrapper&amp;&amp;);
+    void formData(DeferredWrapper&amp;&amp;);
+    void json(DeferredWrapper&amp;&amp;);
+    void text(DeferredWrapper&amp;&amp;);
+
</ins><span class="cx">     void loadBlob(Blob&amp;, FetchLoader::Type);
</span><span class="cx"> 
</span><span class="cx">     bool isActive() const { return !!m_blobLoader; }
</span><span class="lines">@@ -61,6 +62,8 @@
</span><span class="cx">     // ActiveDOMObject API
</span><span class="cx">     void stop() override;
</span><span class="cx"> 
</span><ins>+    void setDisturbed() { m_isDisturbed = true; }
+
</ins><span class="cx"> private:
</span><span class="cx">     // Blob loading routines
</span><span class="cx">     void loadedBlobAsText(String&amp;&amp;);
</span><span class="lines">@@ -85,6 +88,7 @@
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     FetchBody m_body;
</span><ins>+    bool m_isDisturbed { false };
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     Optional&lt;BlobLoader&gt; m_blobLoader;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (198889 => 198890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp        2016-03-31 08:31:25 UTC (rev 198889)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp        2016-03-31 10:31:28 UTC (rev 198890)
</span><span class="lines">@@ -295,6 +295,9 @@
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (!input.m_body.isEmpty())
+        input.setDisturbed();
+
</ins><span class="cx">     return adoptRef(*new FetchRequest(context, WTFMove(body), headers.releaseNonNull(), WTFMove(internalRequest)));
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (198889 => 198890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp        2016-03-31 08:31:25 UTC (rev 198889)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp        2016-03-31 10:31:28 UTC (rev 198890)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr&lt;FetchResponse&gt; FetchResponse::clone(ScriptExecutionContext&amp; context, ExceptionCode&amp; ec)
</span><span class="cx"> {
</span><del>-    if (m_body.isDisturbed() || m_isLocked) {
</del><ins>+    if (isDisturbed() || m_isLocked) {
</ins><span class="cx">         ec = TypeError;
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>