Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (267088 => 267089)
--- trunk/Source/WebCore/CMakeLists.txt 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-09-15 17:04:05 UTC (rev 267089)
@@ -265,7 +265,6 @@
Modules/entriesapi/FileSystemFileEntry.idl
Modules/entriesapi/HTMLInputElementEntriesAPI.idl
- Modules/fetch/DOMWindowFetch.idl
Modules/fetch/FetchBody.idl
Modules/fetch/FetchHeaders.idl
Modules/fetch/FetchReferrerPolicy.idl
@@ -276,7 +275,7 @@
Modules/fetch/FetchRequestMode.idl
Modules/fetch/FetchRequestRedirect.idl
Modules/fetch/FetchResponse.idl
- Modules/fetch/WorkerGlobalScopeFetch.idl
+ Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl
Modules/geolocation/Geolocation.idl
Modules/geolocation/GeolocationCoordinates.idl
Modified: trunk/Source/WebCore/ChangeLog (267088 => 267089)
--- trunk/Source/WebCore/ChangeLog 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/ChangeLog 2020-09-15 17:04:05 UTC (rev 267089)
@@ -1,3 +1,35 @@
+2020-09-15 Sam Weinig <wei...@apple.com>
+
+ [WebIDL] Update Fetch IDLs to use WindowOrWorkerGlobalScope partial mixin
+ https://bugs.webkit.org/show_bug.cgi?id=216524
+
+ Reviewed by Darin Adler.
+
+ Move global fetch() function definition from DOMWindowFetch.idl & WorkerGlobalScopeFetch.idl
+ to single WindowOrWorkerGlobalScopeFetch.idl, matching the spec.
+
+ Also cleanup some comments in other Fetch related IDLs.
+
+ * CMakeLists.txt:
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources-output.xcfilelist:
+ * DerivedSources.make:
+ * Modules/fetch/DOMWindowFetch.cpp: Removed.
+ * Modules/fetch/DOMWindowFetch.h: Removed.
+ * Modules/fetch/DOMWindowFetch.idl: Removed.
+ * Modules/fetch/FetchRequest.idl:
+ * Modules/fetch/FetchRequestInit.idl:
+ * Modules/fetch/FetchResponse.idl:
+ * Modules/fetch/WindowOrWorkerGlobalScopeFetch.cpp: Added.
+ (WebCore::WindowOrWorkerGlobalScopeFetch::fetch):
+ * Modules/fetch/WindowOrWorkerGlobalScopeFetch.h: Added.
+ * Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl: Added.
+ * Modules/fetch/WorkerGlobalScopeFetch.cpp: Removed.
+ * Modules/fetch/WorkerGlobalScopeFetch.h: Removed.
+ * Modules/fetch/WorkerGlobalScopeFetch.idl: Removed.
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+
2020-09-15 Zalan Bujtas <za...@apple.com>
[LFC] Move Layout::Rect to a dedicated file
Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (267088 => 267089)
--- trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-09-15 17:04:05 UTC (rev 267089)
@@ -94,7 +94,6 @@
$(PROJECT_DIR)/Modules/entriesapi/FileSystemEntryCallback.idl
$(PROJECT_DIR)/Modules/entriesapi/FileSystemFileEntry.idl
$(PROJECT_DIR)/Modules/entriesapi/HTMLInputElementEntriesAPI.idl
-$(PROJECT_DIR)/Modules/fetch/DOMWindowFetch.idl
$(PROJECT_DIR)/Modules/fetch/FetchBody.idl
$(PROJECT_DIR)/Modules/fetch/FetchHeaders.idl
$(PROJECT_DIR)/Modules/fetch/FetchReferrerPolicy.idl
@@ -105,7 +104,7 @@
$(PROJECT_DIR)/Modules/fetch/FetchRequestMode.idl
$(PROJECT_DIR)/Modules/fetch/FetchRequestRedirect.idl
$(PROJECT_DIR)/Modules/fetch/FetchResponse.idl
-$(PROJECT_DIR)/Modules/fetch/WorkerGlobalScopeFetch.idl
+$(PROJECT_DIR)/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl
$(PROJECT_DIR)/Modules/gamepad/Gamepad.idl
$(PROJECT_DIR)/Modules/gamepad/GamepadButton.idl
$(PROJECT_DIR)/Modules/gamepad/GamepadEvent.idl
Modified: trunk/Source/WebCore/DerivedSources-output.xcfilelist (267088 => 267089)
--- trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-09-15 17:04:05 UTC (rev 267089)
@@ -490,8 +490,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowCaches.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowCaches.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowFetch.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowFetch.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowIndexedDatabase.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowIndexedDatabase.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowQuota.cpp
@@ -2312,6 +2310,8 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowEventHandlers.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScopeFetch.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScopeFetch.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorker.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorker.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScope.cpp
@@ -2318,8 +2318,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScope.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeCaches.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeCaches.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeFetch.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeFetch.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeIndexedDatabase.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeIndexedDatabase.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerLocation.cpp
Modified: trunk/Source/WebCore/DerivedSources.make (267088 => 267089)
--- trunk/Source/WebCore/DerivedSources.make 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/DerivedSources.make 2020-09-15 17:04:05 UTC (rev 267089)
@@ -197,7 +197,6 @@
$(WebCore)/Modules/entriesapi/FileSystemEntryCallback.idl \
$(WebCore)/Modules/entriesapi/FileSystemFileEntry.idl \
$(WebCore)/Modules/entriesapi/HTMLInputElementEntriesAPI.idl \
- $(WebCore)/Modules/fetch/DOMWindowFetch.idl \
$(WebCore)/Modules/fetch/FetchBody.idl \
$(WebCore)/Modules/fetch/FetchHeaders.idl \
$(WebCore)/Modules/fetch/FetchReferrerPolicy.idl \
@@ -208,7 +207,7 @@
$(WebCore)/Modules/fetch/FetchRequestMode.idl \
$(WebCore)/Modules/fetch/FetchRequestRedirect.idl \
$(WebCore)/Modules/fetch/FetchResponse.idl \
- $(WebCore)/Modules/fetch/WorkerGlobalScopeFetch.idl \
+ $(WebCore)/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl \
$(WebCore)/Modules/gamepad/Gamepad.idl \
$(WebCore)/Modules/gamepad/GamepadButton.idl \
$(WebCore)/Modules/gamepad/GamepadEvent.idl \
Deleted: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.cpp 2020-09-15 17:04:05 UTC (rev 267089)
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 Canon Inc.
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions
- * are required to be met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Canon Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DOMWindowFetch.h"
-
-#include "DOMWindow.h"
-#include "Document.h"
-#include "FetchResponse.h"
-#include "JSDOMPromiseDeferred.h"
-#include "JSFetchResponse.h"
-#include "UserGestureIndicator.h"
-
-namespace WebCore {
-
-using FetchResponsePromise = DOMPromiseDeferred<IDLInterface<FetchResponse>>;
-
-void DOMWindowFetch::fetch(DOMWindow& window, FetchRequest::Info&& input, FetchRequest::Init&& init, Ref<DeferredPromise>&& deferred)
-{
- FetchResponsePromise promise = WTFMove(deferred);
-
- auto* document = window.document();
- if (!document) {
- promise.reject(InvalidStateError);
- return;
- }
-
- auto request = FetchRequest::create(*document, WTFMove(input), WTFMove(init));
- if (request.hasException()) {
- promise.reject(request.releaseException());
- return;
- }
-
- FetchResponse::fetch(*document, request.releaseReturnValue(), [promise = WTFMove(promise), userGestureToken = UserGestureIndicator::currentUserGesture()](ExceptionOr<FetchResponse&>&& result) mutable {
- if (!userGestureToken || userGestureToken->hasExpired(UserGestureToken::maximumIntervalForUserGestureForwardingForFetch()) || !userGestureToken->processingUserGesture()) {
- promise.settle(WTFMove(result));
- return;
- }
-
- UserGestureIndicator gestureIndicator(userGestureToken, UserGestureToken::GestureScope::MediaOnly, UserGestureToken::IsPropagatedFromFetch::Yes);
- promise.settle(WTFMove(result));
- });
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.h 2020-09-15 17:04:05 UTC (rev 267089)
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 Canon Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions
- * are required to be met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Canon Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "FetchRequest.h"
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-class DeferredPromise;
-class DOMWindow;
-
-class DOMWindowFetch {
-public:
- static void fetch(DOMWindow&, FetchRequest::Info&&, FetchRequest::Init&&, Ref<DeferredPromise>&&);
-};
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.idl (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.idl 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/DOMWindowFetch.idl 2020-09-15 17:04:05 UTC (rev 267089)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Canon Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions
- * are required to be met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Canon Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-typedef (FetchRequest or USVString) RequestInfo;
-
-[
- EnabledAtRuntime=FetchAPI,
- ImplementedBy=DOMWindowFetch
-] partial interface DOMWindow {
- Promise<FetchResponse> fetch(RequestInfo input, optional FetchRequestInit init);
-};
Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.idl (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/FetchRequest.idl 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.idl 2020-09-15 17:04:05 UTC (rev 267089)
@@ -30,8 +30,6 @@
typedef (FetchRequest or USVString) RequestInfo;
-typedef (Blob or BufferSource or DOMFormData or URLSearchParams or ReadableStream or USVString) BodyInit;
-
[
ActiveDOMObject,
EnabledAtRuntime=FetchAPI,
@@ -54,6 +52,10 @@
readonly attribute FetchRequestRedirect redirect;
readonly attribute DOMString integrity;
[EnabledAtRuntime=FetchAPIKeepAlive] readonly attribute boolean keepalive;
+ // FIXME: Implement 'isReloadNavigation'.
+ // readonly attribute boolean isReloadNavigation;
+ // FIXME: Implement 'isHistoryNavigation'.
+ // readonly attribute boolean isHistoryNavigation;
readonly attribute AbortSignal signal;
[CallWith=ScriptExecutionContext, MayThrowException, NewObject] FetchRequest clone();
Modified: trunk/Source/WebCore/Modules/fetch/FetchRequestInit.idl (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/FetchRequestInit.idl 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequestInit.idl 2020-09-15 17:04:05 UTC (rev 267089)
@@ -39,6 +39,7 @@
FetchRequestRedirect redirect;
DOMString integrity;
boolean keepalive;
+ // FIXME: 'signal' should be of type AbortSignal?.
any signal;
any window; // can only be set to null
};
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.idl (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/FetchResponse.idl 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.idl 2020-09-15 17:04:05 UTC (rev 267089)
@@ -57,8 +57,6 @@
readonly attribute boolean ok;
readonly attribute ByteString statusText;
readonly attribute FetchHeaders headers; // FIXME: Should be [SameObject].
- // FIXME: Add support for trailers.
- // readonly attribute Promise<Headers> trailer;
[CallWith=ScriptExecutionContext, MayThrowException, NewObject] FetchResponse clone();
};
Added: trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.cpp (0 => 267089)
--- trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.cpp 2020-09-15 17:04:05 UTC (rev 267089)
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WindowOrWorkerGlobalScopeFetch.h"
+
+#include "DOMWindow.h"
+#include "Document.h"
+#include "FetchResponse.h"
+#include "JSDOMPromiseDeferred.h"
+#include "JSFetchResponse.h"
+#include "UserGestureIndicator.h"
+#include "WorkerGlobalScope.h"
+
+namespace WebCore {
+
+using FetchResponsePromise = DOMPromiseDeferred<IDLInterface<FetchResponse>>;
+
+void WindowOrWorkerGlobalScopeFetch::fetch(DOMWindow& window, FetchRequest::Info&& input, FetchRequest::Init&& init, Ref<DeferredPromise>&& deferred)
+{
+ FetchResponsePromise promise = WTFMove(deferred);
+
+ auto* document = window.document();
+ if (!document) {
+ promise.reject(InvalidStateError);
+ return;
+ }
+
+ auto request = FetchRequest::create(*document, WTFMove(input), WTFMove(init));
+ if (request.hasException()) {
+ promise.reject(request.releaseException());
+ return;
+ }
+
+ FetchResponse::fetch(*document, request.releaseReturnValue(), [promise = WTFMove(promise), userGestureToken = UserGestureIndicator::currentUserGesture()](ExceptionOr<FetchResponse&>&& result) mutable {
+ if (!userGestureToken || userGestureToken->hasExpired(UserGestureToken::maximumIntervalForUserGestureForwardingForFetch()) || !userGestureToken->processingUserGesture()) {
+ promise.settle(WTFMove(result));
+ return;
+ }
+
+ UserGestureIndicator gestureIndicator(userGestureToken, UserGestureToken::GestureScope::MediaOnly, UserGestureToken::IsPropagatedFromFetch::Yes);
+ promise.settle(WTFMove(result));
+ });
+}
+
+void WindowOrWorkerGlobalScopeFetch::fetch(WorkerGlobalScope& scope, FetchRequest::Info&& input, FetchRequest::Init&& init, Ref<DeferredPromise>&& deferred)
+{
+ FetchResponsePromise promise = WTFMove(deferred);
+
+ auto request = FetchRequest::create(scope, WTFMove(input), WTFMove(init));
+ if (request.hasException()) {
+ promise.reject(request.releaseException());
+ return;
+ }
+
+ FetchResponse::fetch(scope, request.releaseReturnValue().get(), [promise = WTFMove(promise)](ExceptionOr<FetchResponse&>&& result) mutable {
+ promise.settle(WTFMove(result));
+ });
+}
+
+}
Copied: trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.h (from rev 267088, trunk/Source/WebCore/Modules/fetch/FetchRequestInit.idl) (0 => 267089)
--- trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.h (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.h 2020-09-15 17:04:05 UTC (rev 267089)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "FetchRequest.h"
+
+namespace WebCore {
+
+class DOMWindow;
+class DeferredPromise;
+class WorkerGlobalScope;
+
+class WindowOrWorkerGlobalScopeFetch {
+public:
+ static void fetch(DOMWindow&, FetchRequest::Info&&, FetchRequest::Init&&, Ref<DeferredPromise>&&);
+ static void fetch(WorkerGlobalScope&, FetchRequest::Info&&, FetchRequest::Init&&, Ref<DeferredPromise>&&);
+};
+
+} // namespace WebCore
Copied: trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl (from rev 267088, trunk/Source/WebCore/Modules/fetch/FetchRequestInit.idl) (0 => 267089)
--- trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl (rev 0)
+++ trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl 2020-09-15 17:04:05 UTC (rev 267089)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+typedef (FetchRequest or USVString) RequestInfo;
+
+// https://fetch.spec.whatwg.org/#fetch-method
+[
+ EnabledAtRuntime=FetchAPI,
+ ImplementedBy=WindowOrWorkerGlobalScopeFetch
+] partial interface mixin WindowOrWorkerGlobalScope {
+ [NewObject] Promise<FetchResponse> fetch(RequestInfo input, optional FetchRequestInit init);
+};
Deleted: trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp 2020-09-15 17:04:05 UTC (rev 267089)
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2016 Canon Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions
- * are required to be met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Canon Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WorkerGlobalScopeFetch.h"
-
-#include "FetchResponse.h"
-#include "JSDOMPromiseDeferred.h"
-#include "JSFetchResponse.h"
-#include "WorkerGlobalScope.h"
-
-namespace WebCore {
-
-using FetchResponsePromise = DOMPromiseDeferred<IDLInterface<FetchResponse>>;
-
-void WorkerGlobalScopeFetch::fetch(WorkerGlobalScope& scope, FetchRequest::Info&& input, FetchRequest::Init&& init, Ref<DeferredPromise>&& deferred)
-{
- FetchResponsePromise promise = WTFMove(deferred);
-
- auto request = FetchRequest::create(scope, WTFMove(input), WTFMove(init));
- if (request.hasException()) {
- promise.reject(request.releaseException());
- return;
- }
-
- FetchResponse::fetch(scope, request.releaseReturnValue().get(), [promise = WTFMove(promise)](ExceptionOr<FetchResponse&>&& result) mutable {
- promise.settle(WTFMove(result));
- });
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h 2020-09-15 17:04:05 UTC (rev 267089)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 Canon Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions
- * are required to be met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Canon Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "FetchRequest.h"
-
-namespace WebCore {
-
-class DeferredPromise;
-class WorkerGlobalScope;
-
-class WorkerGlobalScopeFetch {
-public:
- static void fetch(WorkerGlobalScope&, FetchRequest::Info&&, FetchRequest::Init&&, Ref<DeferredPromise>&&);
-};
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.idl (267088 => 267089)
--- trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.idl 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.idl 2020-09-15 17:04:05 UTC (rev 267089)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2016 Canon Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions
- * are required to be met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Canon Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-typedef (FetchRequest or USVString) RequestInfo;
-
-[
- EnabledAtRuntime=FetchAPI,
- ImplementedBy=WorkerGlobalScopeFetch
-] partial interface WorkerGlobalScope {
- Promise<FetchResponse> fetch(RequestInfo input, optional FetchRequestInit init);
-};
Modified: trunk/Source/WebCore/Sources.txt (267088 => 267089)
--- trunk/Source/WebCore/Sources.txt 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/Sources.txt 2020-09-15 17:04:05 UTC (rev 267089)
@@ -48,7 +48,6 @@
Modules/entriesapi/FileSystemEntry.cpp
Modules/entriesapi/FileSystemFileEntry.cpp
Modules/entriesapi/HTMLInputElementEntriesAPI.cpp
-Modules/fetch/DOMWindowFetch.cpp
Modules/fetch/FetchBody.cpp
Modules/fetch/FetchBodyConsumer.cpp
Modules/fetch/FetchBodyOwner.cpp
@@ -57,7 +56,7 @@
Modules/fetch/FetchLoader.cpp
Modules/fetch/FetchRequest.cpp
Modules/fetch/FetchResponse.cpp
-Modules/fetch/WorkerGlobalScopeFetch.cpp
+Modules/fetch/WindowOrWorkerGlobalScopeFetch.cpp
Modules/geolocation/GeoNotifier.cpp
Modules/geolocation/Geolocation.cpp
Modules/geolocation/GeolocationController.cpp
@@ -2816,7 +2815,6 @@
JSDOMURLMediaSource.cpp
JSDOMWindow.cpp
JSDOMWindowCaches.cpp
-JSDOMWindowFetch.cpp
JSDOMWindowIndexedDatabase.cpp
JSDOMWindowQuota.cpp
JSDOMWindowSpeechSynthesis.cpp
@@ -3657,10 +3655,10 @@
JSWheelEvent.cpp
JSWindowEventHandlers.cpp
JSWindowOrWorkerGlobalScope.cpp
+JSWindowOrWorkerGlobalScopeFetch.cpp
JSWorker.cpp
JSWorkerGlobalScope.cpp
JSWorkerGlobalScopeCaches.cpp
-JSWorkerGlobalScopeFetch.cpp
JSWorkerGlobalScopeIndexedDatabase.cpp
JSWorkerLocation.cpp
JSWorkerNavigator.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (267088 => 267089)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-09-15 16:28:33 UTC (rev 267088)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-09-15 17:04:05 UTC (rev 267089)
@@ -7624,12 +7624,6 @@
418938AF2429F9AB007FDC41 /* RetrieveRecordsOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RetrieveRecordsOptions.h; sourceTree = "<group>"; };
418A06CE133C04D500CD379C /* EventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDispatcher.h; sourceTree = "<group>"; };
418A06CF133C04D500CD379C /* EventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventDispatcher.cpp; sourceTree = "<group>"; };
- 418C39521C8DAC7B0051C8A3 /* DOMWindowFetch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowFetch.cpp; sourceTree = "<group>"; };
- 418C39531C8DAC7B0051C8A3 /* DOMWindowFetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowFetch.h; sourceTree = "<group>"; };
- 418C39541C8DAC7B0051C8A3 /* DOMWindowFetch.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMWindowFetch.idl; sourceTree = "<group>"; };
- 418C39571C8DD6960051C8A3 /* WorkerGlobalScopeFetch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerGlobalScopeFetch.cpp; sourceTree = "<group>"; };
- 418C39581C8DD6960051C8A3 /* WorkerGlobalScopeFetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerGlobalScopeFetch.h; sourceTree = "<group>"; };
- 418C39591C8DD6960051C8A3 /* WorkerGlobalScopeFetch.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WorkerGlobalScopeFetch.idl; sourceTree = "<group>"; };
418C395B1C8F0A610051C8A3 /* ReadableStreamSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamSource.h; sourceTree = "<group>"; };
418C395C1C8F0A610051C8A3 /* ReadableStreamSource.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamSource.idl; sourceTree = "<group>"; };
418C395D1C8F0AAB0051C8A3 /* JSReadableStreamSourceCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamSourceCustom.cpp; sourceTree = "<group>"; };
@@ -10139,6 +10133,9 @@
7C2D7229250838B000539662 /* GlobalEventHandlersCSSTransitions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GlobalEventHandlersCSSTransitions.idl; sourceTree = "<group>"; };
7C2D722C2508396300539662 /* GlobalEventHandlersCSSAnimations.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GlobalEventHandlersCSSAnimations.idl; sourceTree = "<group>"; };
7C2D722E25083A3400539662 /* GlobalEventHandlersPointerEvents.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GlobalEventHandlersPointerEvents.idl; sourceTree = "<group>"; };
+ 7C2E0BCF25106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WindowOrWorkerGlobalScopeFetch.h; sourceTree = "<group>"; };
+ 7C2E0BD025106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WindowOrWorkerGlobalScopeFetch.cpp; sourceTree = "<group>"; };
+ 7C2E0BD125106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WindowOrWorkerGlobalScopeFetch.idl; sourceTree = "<group>"; };
7C2FA60F1EA95A3200A03108 /* ResourceCryptographicDigest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceCryptographicDigest.cpp; sourceTree = "<group>"; };
7C2FA6101EA95A3200A03108 /* ResourceCryptographicDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceCryptographicDigest.h; sourceTree = "<group>"; };
7C30D97E1F815AC000268356 /* JSAbortController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAbortController.cpp; sourceTree = "<group>"; };
@@ -19121,9 +19118,6 @@
41F54F7C1C50C4F600338488 /* fetch */ = {
isa = PBXGroup;
children = (
- 418C39521C8DAC7B0051C8A3 /* DOMWindowFetch.cpp */,
- 418C39531C8DAC7B0051C8A3 /* DOMWindowFetch.h */,
- 418C39541C8DAC7B0051C8A3 /* DOMWindowFetch.idl */,
41F54F7D1C50C4F600338488 /* FetchBody.cpp */,
41F54F7E1C50C4F600338488 /* FetchBody.h */,
41F54F7F1C50C4F600338488 /* FetchBody.idl */,
@@ -19158,9 +19152,9 @@
413015D51C7B570400091C6E /* FetchResponse.cpp */,
413015D61C7B570400091C6E /* FetchResponse.h */,
413015D71C7B570400091C6E /* FetchResponse.idl */,
- 418C39571C8DD6960051C8A3 /* WorkerGlobalScopeFetch.cpp */,
- 418C39581C8DD6960051C8A3 /* WorkerGlobalScopeFetch.h */,
- 418C39591C8DD6960051C8A3 /* WorkerGlobalScopeFetch.idl */,
+ 7C2E0BD025106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.cpp */,
+ 7C2E0BCF25106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.h */,
+ 7C2E0BD125106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.idl */,
);
path = fetch;
sourceTree = "<group>";
