Changeset 267089 in webkit
- Timestamp:
- Sep 15, 2020 10:04:05 AM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 1 added
- 6 deleted
- 10 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r267026 r267089 266 266 Modules/entriesapi/HTMLInputElementEntriesAPI.idl 267 267 268 Modules/fetch/DOMWindowFetch.idl269 268 Modules/fetch/FetchBody.idl 270 269 Modules/fetch/FetchHeaders.idl … … 277 276 Modules/fetch/FetchRequestRedirect.idl 278 277 Modules/fetch/FetchResponse.idl 279 Modules/fetch/W orkerGlobalScopeFetch.idl278 Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl 280 279 281 280 Modules/geolocation/Geolocation.idl -
trunk/Source/WebCore/ChangeLog
r267087 r267089 1 2020-09-15 Sam Weinig <weinig@apple.com> 2 3 [WebIDL] Update Fetch IDLs to use WindowOrWorkerGlobalScope partial mixin 4 https://bugs.webkit.org/show_bug.cgi?id=216524 5 6 Reviewed by Darin Adler. 7 8 Move global fetch() function definition from DOMWindowFetch.idl & WorkerGlobalScopeFetch.idl 9 to single WindowOrWorkerGlobalScopeFetch.idl, matching the spec. 10 11 Also cleanup some comments in other Fetch related IDLs. 12 13 * CMakeLists.txt: 14 * DerivedSources-input.xcfilelist: 15 * DerivedSources-output.xcfilelist: 16 * DerivedSources.make: 17 * Modules/fetch/DOMWindowFetch.cpp: Removed. 18 * Modules/fetch/DOMWindowFetch.h: Removed. 19 * Modules/fetch/DOMWindowFetch.idl: Removed. 20 * Modules/fetch/FetchRequest.idl: 21 * Modules/fetch/FetchRequestInit.idl: 22 * Modules/fetch/FetchResponse.idl: 23 * Modules/fetch/WindowOrWorkerGlobalScopeFetch.cpp: Added. 24 (WebCore::WindowOrWorkerGlobalScopeFetch::fetch): 25 * Modules/fetch/WindowOrWorkerGlobalScopeFetch.h: Added. 26 * Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl: Added. 27 * Modules/fetch/WorkerGlobalScopeFetch.cpp: Removed. 28 * Modules/fetch/WorkerGlobalScopeFetch.h: Removed. 29 * Modules/fetch/WorkerGlobalScopeFetch.idl: Removed. 30 * Sources.txt: 31 * WebCore.xcodeproj/project.pbxproj: 32 1 33 2020-09-15 Zalan Bujtas <zalan@apple.com> 2 34 -
trunk/Source/WebCore/DerivedSources-input.xcfilelist
r267011 r267089 95 95 $(PROJECT_DIR)/Modules/entriesapi/FileSystemFileEntry.idl 96 96 $(PROJECT_DIR)/Modules/entriesapi/HTMLInputElementEntriesAPI.idl 97 $(PROJECT_DIR)/Modules/fetch/DOMWindowFetch.idl98 97 $(PROJECT_DIR)/Modules/fetch/FetchBody.idl 99 98 $(PROJECT_DIR)/Modules/fetch/FetchHeaders.idl … … 106 105 $(PROJECT_DIR)/Modules/fetch/FetchRequestRedirect.idl 107 106 $(PROJECT_DIR)/Modules/fetch/FetchResponse.idl 108 $(PROJECT_DIR)/Modules/fetch/W orkerGlobalScopeFetch.idl107 $(PROJECT_DIR)/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl 109 108 $(PROJECT_DIR)/Modules/gamepad/Gamepad.idl 110 109 $(PROJECT_DIR)/Modules/gamepad/GamepadButton.idl -
trunk/Source/WebCore/DerivedSources-output.xcfilelist
r267011 r267089 491 491 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowCaches.cpp 492 492 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowCaches.h 493 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowFetch.cpp494 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowFetch.h495 493 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowIndexedDatabase.cpp 496 494 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowIndexedDatabase.h … … 2313 2311 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope.cpp 2314 2312 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope.h 2313 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScopeFetch.cpp 2314 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScopeFetch.h 2315 2315 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorker.cpp 2316 2316 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorker.h … … 2319 2319 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeCaches.cpp 2320 2320 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeCaches.h 2321 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeFetch.cpp2322 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeFetch.h2323 2321 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeIndexedDatabase.cpp 2324 2322 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScopeIndexedDatabase.h -
trunk/Source/WebCore/DerivedSources.make
r267011 r267089 198 198 $(WebCore)/Modules/entriesapi/FileSystemFileEntry.idl \ 199 199 $(WebCore)/Modules/entriesapi/HTMLInputElementEntriesAPI.idl \ 200 $(WebCore)/Modules/fetch/DOMWindowFetch.idl \201 200 $(WebCore)/Modules/fetch/FetchBody.idl \ 202 201 $(WebCore)/Modules/fetch/FetchHeaders.idl \ … … 209 208 $(WebCore)/Modules/fetch/FetchRequestRedirect.idl \ 210 209 $(WebCore)/Modules/fetch/FetchResponse.idl \ 211 $(WebCore)/Modules/fetch/W orkerGlobalScopeFetch.idl \210 $(WebCore)/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl \ 212 211 $(WebCore)/Modules/gamepad/Gamepad.idl \ 213 212 $(WebCore)/Modules/gamepad/GamepadButton.idl \ -
trunk/Source/WebCore/Modules/fetch/FetchRequest.idl
r267007 r267089 31 31 typedef (FetchRequest or USVString) RequestInfo; 32 32 33 typedef (Blob or BufferSource or DOMFormData or URLSearchParams or ReadableStream or USVString) BodyInit;34 35 33 [ 36 34 ActiveDOMObject, … … 55 53 readonly attribute DOMString integrity; 56 54 [EnabledAtRuntime=FetchAPIKeepAlive] readonly attribute boolean keepalive; 55 // FIXME: Implement 'isReloadNavigation'. 56 // readonly attribute boolean isReloadNavigation; 57 // FIXME: Implement 'isHistoryNavigation'. 58 // readonly attribute boolean isHistoryNavigation; 57 59 readonly attribute AbortSignal signal; 58 60 -
trunk/Source/WebCore/Modules/fetch/FetchRequestInit.idl
r241137 r267089 40 40 DOMString integrity; 41 41 boolean keepalive; 42 // FIXME: 'signal' should be of type AbortSignal?. 42 43 any signal; 43 44 any window; // can only be set to null -
trunk/Source/WebCore/Modules/fetch/FetchResponse.idl
r267007 r267089 58 58 readonly attribute ByteString statusText; 59 59 readonly attribute FetchHeaders headers; // FIXME: Should be [SameObject]. 60 // FIXME: Add support for trailers.61 // readonly attribute Promise<Headers> trailer;62 60 63 61 [CallWith=ScriptExecutionContext, MayThrowException, NewObject] FetchResponse clone(); -
trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.h
r267088 r267089 1 1 /* 2 * Copyright (C) 20 17Apple Inc. All rights reserved.2 * Copyright (C) 2020 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 typedef (sequence<sequence<ByteString>> or record<ByteString, ByteString>) HeadersInit; 26 #pragma once 27 27 28 typedef (Blob or BufferSource or DOMFormData or URLSearchParams or ReadableStream or USVString) BodyInit; 28 #include "FetchRequest.h" 29 29 30 dictionary FetchRequestInit { 31 ByteString method; 32 HeadersInit headers; 33 BodyInit? body; 34 USVString referrer; 35 FetchReferrerPolicy referrerPolicy; 36 FetchRequestMode mode; 37 FetchRequestCredentials credentials; 38 FetchRequestCache cache; 39 FetchRequestRedirect redirect; 40 DOMString integrity; 41 boolean keepalive; 42 any signal; 43 any window; // can only be set to null 30 namespace WebCore { 31 32 class DOMWindow; 33 class DeferredPromise; 34 class WorkerGlobalScope; 35 36 class WindowOrWorkerGlobalScopeFetch { 37 public: 38 static void fetch(DOMWindow&, FetchRequest::Info&&, FetchRequest::Init&&, Ref<DeferredPromise>&&); 39 static void fetch(WorkerGlobalScope&, FetchRequest::Info&&, FetchRequest::Init&&, Ref<DeferredPromise>&&); 44 40 }; 41 42 } // namespace WebCore -
trunk/Source/WebCore/Modules/fetch/WindowOrWorkerGlobalScopeFetch.idl
r267088 r267089 1 1 /* 2 * Copyright (C) 20 17Apple Inc. All rights reserved.2 * Copyright (C) 2020 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 typedef ( sequence<sequence<ByteString>> or record<ByteString, ByteString>) HeadersInit;26 typedef (FetchRequest or USVString) RequestInfo; 27 27 28 typedef (Blob or BufferSource or DOMFormData or URLSearchParams or ReadableStream or USVString) BodyInit; 29 30 dictionary FetchRequestInit { 31 ByteString method; 32 HeadersInit headers; 33 BodyInit? body; 34 USVString referrer; 35 FetchReferrerPolicy referrerPolicy; 36 FetchRequestMode mode; 37 FetchRequestCredentials credentials; 38 FetchRequestCache cache; 39 FetchRequestRedirect redirect; 40 DOMString integrity; 41 boolean keepalive; 42 any signal; 43 any window; // can only be set to null 28 // https://fetch.spec.whatwg.org/#fetch-method 29 [ 30 EnabledAtRuntime=FetchAPI, 31 ImplementedBy=WindowOrWorkerGlobalScopeFetch 32 ] partial interface mixin WindowOrWorkerGlobalScope { 33 [NewObject] Promise<FetchResponse> fetch(RequestInfo input, optional FetchRequestInit init); 44 34 }; -
trunk/Source/WebCore/Sources.txt
r267076 r267089 49 49 Modules/entriesapi/FileSystemFileEntry.cpp 50 50 Modules/entriesapi/HTMLInputElementEntriesAPI.cpp 51 Modules/fetch/DOMWindowFetch.cpp52 51 Modules/fetch/FetchBody.cpp 53 52 Modules/fetch/FetchBodyConsumer.cpp … … 58 57 Modules/fetch/FetchRequest.cpp 59 58 Modules/fetch/FetchResponse.cpp 60 Modules/fetch/W orkerGlobalScopeFetch.cpp59 Modules/fetch/WindowOrWorkerGlobalScopeFetch.cpp 61 60 Modules/geolocation/GeoNotifier.cpp 62 61 Modules/geolocation/Geolocation.cpp … … 2817 2816 JSDOMWindow.cpp 2818 2817 JSDOMWindowCaches.cpp 2819 JSDOMWindowFetch.cpp2820 2818 JSDOMWindowIndexedDatabase.cpp 2821 2819 JSDOMWindowQuota.cpp … … 3658 3656 JSWindowEventHandlers.cpp 3659 3657 JSWindowOrWorkerGlobalScope.cpp 3658 JSWindowOrWorkerGlobalScopeFetch.cpp 3660 3659 JSWorker.cpp 3661 3660 JSWorkerGlobalScope.cpp 3662 3661 JSWorkerGlobalScopeCaches.cpp 3663 JSWorkerGlobalScopeFetch.cpp3664 3662 JSWorkerGlobalScopeIndexedDatabase.cpp 3665 3663 JSWorkerLocation.cpp -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r267087 r267089 7625 7625 418A06CE133C04D500CD379C /* EventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDispatcher.h; sourceTree = "<group>"; }; 7626 7626 418A06CF133C04D500CD379C /* EventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventDispatcher.cpp; sourceTree = "<group>"; }; 7627 418C39521C8DAC7B0051C8A3 /* DOMWindowFetch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowFetch.cpp; sourceTree = "<group>"; };7628 418C39531C8DAC7B0051C8A3 /* DOMWindowFetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowFetch.h; sourceTree = "<group>"; };7629 418C39541C8DAC7B0051C8A3 /* DOMWindowFetch.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMWindowFetch.idl; sourceTree = "<group>"; };7630 418C39571C8DD6960051C8A3 /* WorkerGlobalScopeFetch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerGlobalScopeFetch.cpp; sourceTree = "<group>"; };7631 418C39581C8DD6960051C8A3 /* WorkerGlobalScopeFetch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerGlobalScopeFetch.h; sourceTree = "<group>"; };7632 418C39591C8DD6960051C8A3 /* WorkerGlobalScopeFetch.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WorkerGlobalScopeFetch.idl; sourceTree = "<group>"; };7633 7627 418C395B1C8F0A610051C8A3 /* ReadableStreamSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamSource.h; sourceTree = "<group>"; }; 7634 7628 418C395C1C8F0A610051C8A3 /* ReadableStreamSource.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamSource.idl; sourceTree = "<group>"; }; … … 10140 10134 7C2D722C2508396300539662 /* GlobalEventHandlersCSSAnimations.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GlobalEventHandlersCSSAnimations.idl; sourceTree = "<group>"; }; 10141 10135 7C2D722E25083A3400539662 /* GlobalEventHandlersPointerEvents.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = GlobalEventHandlersPointerEvents.idl; sourceTree = "<group>"; }; 10136 7C2E0BCF25106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WindowOrWorkerGlobalScopeFetch.h; sourceTree = "<group>"; }; 10137 7C2E0BD025106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WindowOrWorkerGlobalScopeFetch.cpp; sourceTree = "<group>"; }; 10138 7C2E0BD125106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WindowOrWorkerGlobalScopeFetch.idl; sourceTree = "<group>"; }; 10142 10139 7C2FA60F1EA95A3200A03108 /* ResourceCryptographicDigest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceCryptographicDigest.cpp; sourceTree = "<group>"; }; 10143 10140 7C2FA6101EA95A3200A03108 /* ResourceCryptographicDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceCryptographicDigest.h; sourceTree = "<group>"; }; … … 19122 19119 isa = PBXGroup; 19123 19120 children = ( 19124 418C39521C8DAC7B0051C8A3 /* DOMWindowFetch.cpp */,19125 418C39531C8DAC7B0051C8A3 /* DOMWindowFetch.h */,19126 418C39541C8DAC7B0051C8A3 /* DOMWindowFetch.idl */,19127 19121 41F54F7D1C50C4F600338488 /* FetchBody.cpp */, 19128 19122 41F54F7E1C50C4F600338488 /* FetchBody.h */, … … 19159 19153 413015D61C7B570400091C6E /* FetchResponse.h */, 19160 19154 413015D71C7B570400091C6E /* FetchResponse.idl */, 19161 418C39571C8DD6960051C8A3 /*WorkerGlobalScopeFetch.cpp */,19162 418C39581C8DD6960051C8A3 /*WorkerGlobalScopeFetch.h */,19163 418C39591C8DD6960051C8A3 /*WorkerGlobalScopeFetch.idl */,19155 7C2E0BD025106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.cpp */, 19156 7C2E0BCF25106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.h */, 19157 7C2E0BD125106AC4005F3C87 /* WindowOrWorkerGlobalScopeFetch.idl */, 19164 19158 ); 19165 19159 path = fetch;
Note: See TracChangeset
for help on using the changeset viewer.