Diff
Modified: trunk/Source/WebCore/ChangeLog (209194 => 209195)
--- 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)
@@ -1,3 +1,30 @@
+2016-12-01 Joseph Pecoraro <pecor...@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.
+
2016-12-01 Antoine Quint <grao...@apple.com>
[Modern Media Controls] Turn off text selection
Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h (209194 => 209195)
--- 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)
@@ -36,7 +36,6 @@
namespace WebCore {
class DOMWindow;
-class Dictionary;
class FetchRequest;
class DOMWindowFetch {
Modified: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.js (209194 => 209195)
--- 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)
@@ -31,7 +31,7 @@
try {
return @fetchRequest(new @Request(input, init));
- } catch(e) {
+ } catch (e) {
return @Promise.@reject(e);
}
}
Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.cpp (209194 => 209195)
--- 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)
@@ -31,12 +31,10 @@
#if ENABLE(FETCH_API)
-#include "Dictionary.h"
#include "Document.h"
#include "FetchBodyOwner.h"
#include "FetchHeaders.h"
#include "FetchResponseSource.h"
-#include "FormData.h"
#include "HTTPHeaderValues.h"
#include "HTTPParsers.h"
#include "JSBlob.h"
Modified: trunk/Source/WebCore/Modules/fetch/FetchBody.h (209194 => 209195)
--- 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)
@@ -46,9 +46,7 @@
namespace WebCore {
-class DOMFormData;
class FetchBodyOwner;
-class FetchHeaders;
class FetchResponseSource;
class ScriptExecutionContext;
Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp (209194 => 209195)
--- 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)
@@ -32,7 +32,6 @@
#if ENABLE(FETCH_API)
#include "JSBlob.h"
-#include "JSDOMPromise.h"
#include "TextResourceDecoder.h"
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (209194 => 209195)
--- 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)
@@ -32,7 +32,6 @@
#if ENABLE(FETCH_API)
#include "FetchLoader.h"
-#include "FetchResponseSource.h"
#include "HTTPParsers.h"
#include "JSBlob.h"
#include "ResourceResponse.h"
Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (209194 => 209195)
--- 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)
@@ -33,12 +33,13 @@
#include "ActiveDOMObject.h"
#include "FetchBody.h"
#include "FetchHeaders.h"
-#include "FetchLoader.h"
#include "FetchLoaderClient.h"
#include "FetchResponseSource.h"
namespace WebCore {
+class FetchLoader;
+
class FetchBodyOwner : public RefCounted<FetchBodyOwner>, public ActiveDOMObject {
public:
FetchBodyOwner(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&);
Modified: trunk/Source/WebCore/Modules/fetch/FetchInternals.js (209194 => 209195)
--- 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)
@@ -71,7 +71,7 @@
return @Promise.prototype.@then.@call(@readableStreamDefaultReaderRead(reader), pull);
}
return @Promise.prototype.@then.@call(@readableStreamDefaultReaderRead(reader), pull);
- } catch(e) {
+ } catch (e) {
return @Promise.@reject(e);
}
}
Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (209194 => 209195)
--- 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)
@@ -43,7 +43,6 @@
#include "SharedBuffer.h"
#include "TextResourceDecoder.h"
#include "ThreadableBlobRegistry.h"
-#include "ThreadableLoader.h"
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.h (209194 => 209195)
--- 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)
@@ -41,7 +41,6 @@
namespace WebCore {
-class Dictionary;
class FetchRequest;
class ReadableStreamSource;
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.js (209194 => 209195)
--- 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)
@@ -46,7 +46,7 @@
@fillFetchHeaders(this.headers, init.headers);
if (body !== @undefined && body !== null) {
- if (status == 101 || status == 204 || status == 205 || status == 304)
+ if (status === 101 || status === 204 || status === 205 || status === 304)
@throwTypeError("Response cannot have a body with the given status");
// FIXME: Use @isReadableStream once it is no longer guarded by READABLE_STREAM_API guard.
Modified: trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.js (209194 => 209195)
--- 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)
@@ -31,7 +31,7 @@
try {
return @fetchRequest(new @Request(input, init));
- } catch(e) {
+ } catch (e) {
return @Promise.@reject(e);
}
}
