<!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>[209195] 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/209195">209195</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-01 13:22:07 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Misc. cleanup in Modules/fetch
https://bugs.webkit.org/show_bug.cgi?id=165240
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-12-01
Reviewed by Darin Adler.
* Modules/fetch/DOMWindowFetch.h:
* Modules/fetch/FetchBody.cpp:
* Modules/fetch/FetchBody.h:
* Modules/fetch/FetchBodyConsumer.cpp:
* Modules/fetch/FetchBodyOwner.cpp:
* Modules/fetch/FetchBodyOwner.h:
* Modules/fetch/FetchInternals.js:
(consumeStream):
* Modules/fetch/FetchLoader.cpp:
* Modules/fetch/FetchResponse.h:
Remove unnecessary includes and forward declarations.
* Modules/fetch/DOMWindowFetch.js:
(fetch):
* Modules/fetch/FetchResponse.js:
(initializeFetchResponse):
* Modules/fetch/WorkerGlobalScopeFetch.js:
(fetch):
Improve style.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchDOMWindowFetchh">trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchDOMWindowFetchjs">trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.js</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="#trunkSourceWebCoreModulesfetchFetchBodyConsumercpp">trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp</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="#trunkSourceWebCoreModulesfetchFetchInternalsjs">trunk/Source/WebCore/Modules/fetch/FetchInternals.js</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchLoadercpp">trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponseh">trunk/Source/WebCore/Modules/fetch/FetchResponse.h</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchResponsejs">trunk/Source/WebCore/Modules/fetch/FetchResponse.js</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchWorkerGlobalScopeFetchjs">trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-12-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ Misc. cleanup in Modules/fetch
+ https://bugs.webkit.org/show_bug.cgi?id=165240
+
+ Reviewed by Darin Adler.
+
+ * Modules/fetch/DOMWindowFetch.h:
+ * Modules/fetch/FetchBody.cpp:
+ * Modules/fetch/FetchBody.h:
+ * Modules/fetch/FetchBodyConsumer.cpp:
+ * Modules/fetch/FetchBodyOwner.cpp:
+ * Modules/fetch/FetchBodyOwner.h:
+ * Modules/fetch/FetchInternals.js:
+ (consumeStream):
+ * Modules/fetch/FetchLoader.cpp:
+ * Modules/fetch/FetchResponse.h:
+ Remove unnecessary includes and forward declarations.
+
+ * Modules/fetch/DOMWindowFetch.js:
+ (fetch):
+ * Modules/fetch/FetchResponse.js:
+ (initializeFetchResponse):
+ * Modules/fetch/WorkerGlobalScopeFetch.js:
+ (fetch):
+ Improve style.
+
</ins><span class="cx"> 2016-12-01 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Turn off text selection
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchDOMWindowFetchh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class DOMWindow;
</span><del>-class Dictionary;
</del><span class="cx"> class FetchRequest;
</span><span class="cx">
</span><span class="cx"> class DOMWindowFetch {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchDOMWindowFetchjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.js (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.js 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.js 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> return @fetchRequest(new @Request(input, init));
</span><del>- } catch(e) {
</del><ins>+ } catch (e) {
</ins><span class="cx"> return @Promise.@reject(e);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.cpp 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -31,12 +31,10 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx">
</span><del>-#include "Dictionary.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "FetchBodyOwner.h"
</span><span class="cx"> #include "FetchHeaders.h"
</span><span class="cx"> #include "FetchResponseSource.h"
</span><del>-#include "FormData.h"
</del><span class="cx"> #include "HTTPHeaderValues.h"
</span><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "JSBlob.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchBody.h 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -46,9 +46,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DOMFormData;
</del><span class="cx"> class FetchBodyOwner;
</span><del>-class FetchHeaders;
</del><span class="cx"> class FetchResponseSource;
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyConsumercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx">
</span><span class="cx"> #include "JSBlob.h"
</span><del>-#include "JSDOMPromise.h"
</del><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx">
</span><span class="cx"> #include "FetchLoader.h"
</span><del>-#include "FetchResponseSource.h"
</del><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "JSBlob.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchBodyOwnerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -33,12 +33,13 @@
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "FetchBody.h"
</span><span class="cx"> #include "FetchHeaders.h"
</span><del>-#include "FetchLoader.h"
</del><span class="cx"> #include "FetchLoaderClient.h"
</span><span class="cx"> #include "FetchResponseSource.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class FetchLoader;
+
</ins><span class="cx"> class FetchBodyOwner : public RefCounted<FetchBodyOwner>, public ActiveDOMObject {
</span><span class="cx"> public:
</span><span class="cx"> FetchBodyOwner(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchInternals.js (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchInternals.js 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchInternals.js 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return @Promise.prototype.@then.@call(@readableStreamDefaultReaderRead(reader), pull);
</span><span class="cx"> }
</span><span class="cx"> return @Promise.prototype.@then.@call(@readableStreamDefaultReaderRead(reader), pull);
</span><del>- } catch(e) {
</del><ins>+ } catch (e) {
</ins><span class="cx"> return @Promise.@reject(e);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include "ThreadableBlobRegistry.h"
</span><del>-#include "ThreadableLoader.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.h 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Dictionary;
</del><span class="cx"> class FetchRequest;
</span><span class="cx"> class ReadableStreamSource;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchResponsejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.js (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> @fillFetchHeaders(this.headers, init.headers);
</span><span class="cx">
</span><span class="cx"> if (body !== @undefined && body !== null) {
</span><del>- if (status == 101 || status == 204 || status == 205 || status == 304)
</del><ins>+ if (status === 101 || status === 204 || status === 205 || status === 304)
</ins><span class="cx"> @throwTypeError("Response cannot have a body with the given status");
</span><span class="cx">
</span><span class="cx"> // FIXME: Use @isReadableStream once it is no longer guarded by READABLE_STREAM_API guard.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchWorkerGlobalScopeFetchjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.js (209194 => 209195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.js 2016-12-01 21:10:16 UTC (rev 209194)
+++ trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.js 2016-12-01 21:22:07 UTC (rev 209195)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> return @fetchRequest(new @Request(input, init));
</span><del>- } catch(e) {
</del><ins>+ } catch (e) {
</ins><span class="cx"> return @Promise.@reject(e);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>