Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (278162 => 278163)
--- trunk/Source/WebCore/CMakeLists.txt 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/CMakeLists.txt 2021-05-27 13:26:22 UTC (rev 278163)
@@ -229,8 +229,7 @@
Modules/cache/CacheQueryOptions.idl
Modules/cache/DOMCache.idl
Modules/cache/DOMCacheStorage.idl
- Modules/cache/DOMWindow+Caches.idl
- Modules/cache/WorkerGlobalScope+Caches.idl
+ Modules/cache/WindowOrWorkerGlobalScope+Caches.idl
Modules/contact-picker/ContactInfo.idl
Modules/contact-picker/ContactProperty.idl
Modified: trunk/Source/WebCore/ChangeLog (278162 => 278163)
--- trunk/Source/WebCore/ChangeLog 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/ChangeLog 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1,3 +1,39 @@
+2021-05-27 Sam Weinig <wei...@apple.com>
+
+ Merge WorkerGlobalScope+Caches.idl and DOMWindow+Caches.idl into a single WindowOrWorkerGlobalScope+Caches.idl
+ https://bugs.webkit.org/show_bug.cgi?id=226271
+
+ Reviewed by Darin Adler.
+
+ Address FIXMEs in both WorkerGlobalScope+Caches.idl and DOMWindow+Caches.idl by
+ merging them into a single WindowOrWorkerGlobalScope+Caches.idl, matching the spec
+ langauge more closely.
+
+ * CMakeLists.txt:
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources-output.xcfilelist:
+ * DerivedSources.make:
+ * Modules/cache/DOMWindow+Caches.idl: Removed.
+ * Modules/cache/DOMWindowCaches.cpp: Removed.
+ * Modules/cache/DOMWindowCaches.h: Removed.
+ * Modules/cache/WindowOrWorkerGlobalScope+Caches.idl: Added.
+ * Modules/cache/WindowOrWorkerGlobalScopeCaches.cpp: Added.
+ (WebCore::DOMWindowCaches::supplementName):
+ (WebCore::WorkerGlobalScopeCaches::supplementName):
+ (WebCore::DOMWindowCaches::DOMWindowCaches):
+ (WebCore::DOMWindowCaches::from):
+ (WebCore::DOMWindowCaches::caches const):
+ (WebCore::WorkerGlobalScopeCaches::WorkerGlobalScopeCaches):
+ (WebCore::WorkerGlobalScopeCaches::from):
+ (WebCore::WorkerGlobalScopeCaches::caches const):
+ (WebCore::WindowOrWorkerGlobalScopeCaches::caches):
+ * Modules/cache/WindowOrWorkerGlobalScopeCaches.h: Added.
+ * Modules/cache/WorkerGlobalScope+Caches.idl: Removed.
+ * Modules/cache/WorkerGlobalScopeCaches.cpp: Removed.
+ * Modules/cache/WorkerGlobalScopeCaches.h: Removed.
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+
2021-05-27 Adrian Perez de Castro <ape...@igalia.com>
Non-unified build fixes, late May 2021 edition
Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (278162 => 278163)
--- trunk/Source/WebCore/DerivedSources-input.xcfilelist 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist 2021-05-27 13:26:22 UTC (rev 278163)
@@ -72,8 +72,7 @@
$(PROJECT_DIR)/Modules/cache/CacheQueryOptions.idl
$(PROJECT_DIR)/Modules/cache/DOMCache.idl
$(PROJECT_DIR)/Modules/cache/DOMCacheStorage.idl
-$(PROJECT_DIR)/Modules/cache/DOMWindow+Caches.idl
-$(PROJECT_DIR)/Modules/cache/WorkerGlobalScope+Caches.idl
+$(PROJECT_DIR)/Modules/cache/WindowOrWorkerGlobalScope+Caches.idl
$(PROJECT_DIR)/Modules/contact-picker/ContactInfo.idl
$(PROJECT_DIR)/Modules/contact-picker/ContactProperty.idl
$(PROJECT_DIR)/Modules/contact-picker/ContactsManager.idl
Modified: trunk/Source/WebCore/DerivedSources-output.xcfilelist (278162 => 278163)
--- trunk/Source/WebCore/DerivedSources-output.xcfilelist 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/DerivedSources-output.xcfilelist 2021-05-27 13:26:22 UTC (rev 278163)
@@ -554,8 +554,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+CSSOM.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+CSSOMView.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+CSSOMView.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+Caches.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+Caches.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+Compat.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+Compat.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+DeviceMotion.cpp
@@ -574,8 +572,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow+WebDatabase.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindow.cpp
$(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/JSDOMWindowSpeechSynthesis.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowSpeechSynthesis.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDOMWindowWebDatabase.cpp
@@ -2568,6 +2564,8 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowEventHandlers.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowLocalStorage.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowLocalStorage.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope+Caches.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope+Caches.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope+Crypto.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope+Crypto.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowOrWorkerGlobalScope+Fetch.cpp
@@ -2582,12 +2580,8 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWindowSessionStorage.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorker.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorker.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScope+Caches.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScope+Caches.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerGlobalScope.cpp
$(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/JSWorkerLocation.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerLocation.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWorkerNavigator+GPU.cpp
Modified: trunk/Source/WebCore/DerivedSources.make (278162 => 278163)
--- trunk/Source/WebCore/DerivedSources.make 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/DerivedSources.make 2021-05-27 13:26:22 UTC (rev 278163)
@@ -101,8 +101,7 @@
$(WebCore)/Modules/cache/CacheQueryOptions.idl \
$(WebCore)/Modules/cache/DOMCache.idl \
$(WebCore)/Modules/cache/DOMCacheStorage.idl \
- $(WebCore)/Modules/cache/DOMWindow+Caches.idl \
- $(WebCore)/Modules/cache/WorkerGlobalScope+Caches.idl \
+ $(WebCore)/Modules/cache/WindowOrWorkerGlobalScope+Caches.idl \
$(WebCore)/Modules/contact-picker/ContactInfo.idl \
$(WebCore)/Modules/contact-picker/ContactProperty.idl \
$(WebCore)/Modules/contact-picker/ContactsManager.idl \
Deleted: trunk/Source/WebCore/Modules/cache/DOMWindow+Caches.idl (278162 => 278163)
--- trunk/Source/WebCore/Modules/cache/DOMWindow+Caches.idl 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/Modules/cache/DOMWindow+Caches.idl 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1,33 +0,0 @@
-/*
- * 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 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.
- */
-
-// https://w3c.github.io/ServiceWorker/#self-caches
-// FIXME: This should be merged with WorkerGlobalScope+Caches.idl into a new WindowOrWorkerGlobalScope+Caches.idl to match the spec.
-[
- EnabledAtRuntime=CacheAPI,
- ImplementedBy=DOMWindowCaches
-] partial interface DOMWindow {
- [CallWith=ScriptExecutionContext, SecureContext, SameObject] readonly attribute DOMCacheStorage caches;
-};
Deleted: trunk/Source/WebCore/Modules/cache/DOMWindowCaches.cpp (278162 => 278163)
--- trunk/Source/WebCore/Modules/cache/DOMWindowCaches.cpp 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/Modules/cache/DOMWindowCaches.cpp 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1,79 +0,0 @@
-/*
- * 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 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 "DOMWindowCaches.h"
-
-#include "CacheStorageProvider.h"
-#include "DOMCacheStorage.h"
-#include "DOMWindow.h"
-#include "Document.h"
-#include "Frame.h"
-#include "Page.h"
-
-namespace WebCore {
-
-DOMWindowCaches::DOMWindowCaches(DOMWindow* window)
- : DOMWindowProperty(window)
-{
-}
-
-const char* DOMWindowCaches::supplementName()
-{
- return "DOMWindowCaches";
-}
-
-DOMWindowCaches* DOMWindowCaches::from(DOMWindow* window)
-{
- auto* supplement = static_cast<DOMWindowCaches*>(Supplement<DOMWindow>::from(window, supplementName()));
- if (!supplement) {
- auto newSupplement = makeUnique<DOMWindowCaches>(window);
- supplement = newSupplement.get();
- provideTo(window, supplementName(), WTFMove(newSupplement));
- }
- return supplement;
-}
-
-ExceptionOr<DOMCacheStorage*> DOMWindowCaches::caches(ScriptExecutionContext& context, DOMWindow& window)
-{
- if (downcast<Document>(context).isSandboxed(SandboxOrigin))
- return Exception { SecurityError, "Cache storage is disabled because the context is sandboxed and lacks the 'allow-same-origin' flag" };
-
- if (!window.isCurrentlyDisplayedInFrame())
- return nullptr;
-
- return DOMWindowCaches::from(&window)->caches();
-}
-
-DOMCacheStorage* DOMWindowCaches::caches() const
-{
- ASSERT(frame());
- ASSERT(frame()->document());
- if (!m_caches && frame()->page())
- m_caches = DOMCacheStorage::create(*frame()->document(), frame()->page()->cacheStorageProvider().createCacheStorageConnection());
- return m_caches.get();
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/cache/DOMWindowCaches.h (278162 => 278163)
--- trunk/Source/WebCore/Modules/cache/DOMWindowCaches.h 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/Modules/cache/DOMWindowCaches.h 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1,53 +0,0 @@
-/*
- * 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 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 "DOMWindowProperty.h"
-#include "ExceptionOr.h"
-#include "Supplementable.h"
-
-namespace WebCore {
-
-class DOMWindow;
-class DOMCacheStorage;
-class ScriptExecutionContext;
-
-class DOMWindowCaches : public Supplement<DOMWindow>, public DOMWindowProperty {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- explicit DOMWindowCaches(DOMWindow*);
-
- static DOMWindowCaches* from(DOMWindow*);
- static ExceptionOr<DOMCacheStorage*> caches(ScriptExecutionContext&, DOMWindow&);
-
-private:
- static const char* supplementName();
- DOMCacheStorage* caches() const;
-
- mutable RefPtr<DOMCacheStorage> m_caches;
-};
-
-} // namespace WebCore
Copied: trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScope+Caches.idl (from rev 278162, trunk/Source/WebCore/Modules/cache/WorkerGlobalScope+Caches.idl) (0 => 278163)
--- trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScope+Caches.idl (rev 0)
+++ trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScope+Caches.idl 2021-05-27 13:26:22 UTC (rev 278163)
@@ -0,0 +1,32 @@
+/*
+* Copyright (C) 2017-2021 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.
+*/
+
+// https://w3c.github.io/ServiceWorker/#self-caches
+[
+ EnabledAtRuntime=CacheAPI,
+ ImplementedBy=WindowOrWorkerGlobalScopeCaches
+] partial interface mixin WindowOrWorkerGlobalScope {
+ [CallWith=ScriptExecutionContext, SecureContext, SameObject] readonly attribute DOMCacheStorage caches;
+};
Added: trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScopeCaches.cpp (0 => 278163)
--- trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScopeCaches.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScopeCaches.cpp 2021-05-27 13:26:22 UTC (rev 278163)
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2017-2021 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 "WindowOrWorkerGlobalScopeCaches.h"
+
+#include "CacheStorageProvider.h"
+#include "DOMCacheStorage.h"
+#include "DOMWindow.h"
+#include "DOMWindowProperty.h"
+#include "Document.h"
+#include "Frame.h"
+#include "Page.h"
+#include "Supplementable.h"
+#include "WorkerGlobalScope.h"
+
+namespace WebCore {
+
+class DOMWindowCaches : public Supplement<DOMWindow>, public DOMWindowProperty {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ explicit DOMWindowCaches(DOMWindow&);
+ virtual ~DOMWindowCaches() = default;
+
+ static DOMWindowCaches* from(DOMWindow&);
+ DOMCacheStorage* caches() const;
+
+private:
+ static const char* supplementName() { return "DOMWindowCaches"; }
+
+ mutable RefPtr<DOMCacheStorage> m_caches;
+};
+
+class WorkerGlobalScopeCaches : public Supplement<WorkerGlobalScope> {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ explicit WorkerGlobalScopeCaches(WorkerGlobalScope&);
+ virtual ~WorkerGlobalScopeCaches() = default;
+
+ static WorkerGlobalScopeCaches* from(WorkerGlobalScope&);
+ DOMCacheStorage* caches() const;
+
+private:
+ static const char* supplementName() { return "WorkerGlobalScopeCaches"; }
+
+ WorkerGlobalScope& m_scope;
+ mutable RefPtr<DOMCacheStorage> m_caches;
+};
+
+// DOMWindowCaches supplement.
+
+DOMWindowCaches::DOMWindowCaches(DOMWindow& window)
+ : DOMWindowProperty(&window)
+{
+}
+
+DOMWindowCaches* DOMWindowCaches::from(DOMWindow& window)
+{
+ auto* supplement = static_cast<DOMWindowCaches*>(Supplement<DOMWindow>::from(&window, supplementName()));
+ if (!supplement) {
+ auto newSupplement = makeUnique<DOMWindowCaches>(window);
+ supplement = newSupplement.get();
+ provideTo(&window, supplementName(), WTFMove(newSupplement));
+ }
+ return supplement;
+}
+
+DOMCacheStorage* DOMWindowCaches::caches() const
+{
+ ASSERT(frame());
+ ASSERT(frame()->document());
+ if (!m_caches && frame()->page())
+ m_caches = DOMCacheStorage::create(*frame()->document(), frame()->page()->cacheStorageProvider().createCacheStorageConnection());
+ return m_caches.get();
+}
+
+// WorkerGlobalScope supplement.
+
+WorkerGlobalScopeCaches::WorkerGlobalScopeCaches(WorkerGlobalScope& scope)
+ : m_scope(scope)
+{
+}
+
+WorkerGlobalScopeCaches* WorkerGlobalScopeCaches::from(WorkerGlobalScope& scope)
+{
+ auto* supplement = static_cast<WorkerGlobalScopeCaches*>(Supplement<WorkerGlobalScope>::from(&scope, supplementName()));
+ if (!supplement) {
+ auto newSupplement = makeUnique<WorkerGlobalScopeCaches>(scope);
+ supplement = newSupplement.get();
+ provideTo(&scope, supplementName(), WTFMove(newSupplement));
+ }
+ return supplement;
+}
+
+DOMCacheStorage* WorkerGlobalScopeCaches::caches() const
+{
+ if (!m_caches)
+ m_caches = DOMCacheStorage::create(m_scope, m_scope.cacheStorageConnection());
+ return m_caches.get();
+}
+
+// WindowOrWorkerGlobalScopeCaches.
+
+ExceptionOr<DOMCacheStorage*> WindowOrWorkerGlobalScopeCaches::caches(ScriptExecutionContext& context, DOMWindow& window)
+{
+ if (downcast<Document>(context).isSandboxed(SandboxOrigin))
+ return Exception { SecurityError, "Cache storage is disabled because the context is sandboxed and lacks the 'allow-same-origin' flag" };
+
+ if (!window.isCurrentlyDisplayedInFrame())
+ return nullptr;
+
+ return DOMWindowCaches::from(window)->caches();
+}
+
+DOMCacheStorage* WindowOrWorkerGlobalScopeCaches::caches(ScriptExecutionContext&, WorkerGlobalScope& scope)
+{
+ return WorkerGlobalScopeCaches::from(scope)->caches();
+}
+
+} // namespace WebCore
Copied: trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScopeCaches.h (from rev 278162, trunk/Source/WebCore/Modules/cache/DOMWindowCaches.h) (0 => 278163)
--- trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScopeCaches.h (rev 0)
+++ trunk/Source/WebCore/Modules/cache/WindowOrWorkerGlobalScopeCaches.h 2021-05-27 13:26:22 UTC (rev 278163)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017-2021 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
+
+namespace WebCore {
+
+class DOMCacheStorage;
+class DOMWindow;
+class ScriptExecutionContext;
+class WorkerGlobalScope;
+
+template<typename> class ExceptionOr;
+
+class WindowOrWorkerGlobalScopeCaches {
+public:
+ static ExceptionOr<DOMCacheStorage*> caches(ScriptExecutionContext&, DOMWindow&);
+ static DOMCacheStorage* caches(ScriptExecutionContext&, WorkerGlobalScope&);
+};
+
+} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/cache/WorkerGlobalScope+Caches.idl (278162 => 278163)
--- trunk/Source/WebCore/Modules/cache/WorkerGlobalScope+Caches.idl 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/Modules/cache/WorkerGlobalScope+Caches.idl 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1,33 +0,0 @@
-/*
-* 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 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.
-*/
-
-// https://w3c.github.io/ServiceWorker/#self-caches
-// FIXME: This should be merged with DOMWindow+Caches.idl into a new WindowOrWorkerGlobalScope+Caches.idl to match the spec.
-[
- EnabledAtRuntime=CacheAPI,
- ImplementedBy=WorkerGlobalScopeCaches
-] partial interface WorkerGlobalScope {
- [SecureContext, SameObject] readonly attribute DOMCacheStorage caches;
-};
Deleted: trunk/Source/WebCore/Modules/cache/WorkerGlobalScopeCaches.cpp (278162 => 278163)
--- trunk/Source/WebCore/Modules/cache/WorkerGlobalScopeCaches.cpp 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/Modules/cache/WorkerGlobalScopeCaches.cpp 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1,62 +0,0 @@
-/*
- * 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 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 "WorkerGlobalScopeCaches.h"
-
-#include "DOMCacheStorage.h"
-#include "WorkerGlobalScope.h"
-
-namespace WebCore {
-
-const char* WorkerGlobalScopeCaches::supplementName()
-{
- return "WorkerGlobalScopeCaches";
-}
-
-WorkerGlobalScopeCaches* WorkerGlobalScopeCaches::from(WorkerGlobalScope& scope)
-{
- auto* supplement = static_cast<WorkerGlobalScopeCaches*>(Supplement<WorkerGlobalScope>::from(&scope, supplementName()));
- if (!supplement) {
- auto newSupplement = makeUnique<WorkerGlobalScopeCaches>(scope);
- supplement = newSupplement.get();
- provideTo(&scope, supplementName(), WTFMove(newSupplement));
- }
- return supplement;
-}
-
-DOMCacheStorage* WorkerGlobalScopeCaches::caches(WorkerGlobalScope& scope)
-{
- return WorkerGlobalScopeCaches::from(scope)->caches();
-}
-
-DOMCacheStorage* WorkerGlobalScopeCaches::caches() const
-{
- if (!m_caches)
- m_caches = DOMCacheStorage::create(m_scope, m_scope.cacheStorageConnection());
- return m_caches.get();
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/cache/WorkerGlobalScopeCaches.h (278162 => 278163)
--- trunk/Source/WebCore/Modules/cache/WorkerGlobalScopeCaches.h 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/Modules/cache/WorkerGlobalScopeCaches.h 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1,55 +0,0 @@
-/*
- * 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 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 "Supplementable.h"
-
-namespace WebCore {
-
-class DOMCacheStorage;
-class WorkerGlobalScope;
-
-class WorkerGlobalScopeCaches : public Supplement<WorkerGlobalScope> {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- explicit WorkerGlobalScopeCaches(WorkerGlobalScope& scope)
- : m_scope(scope)
- {
- }
-
- static DOMCacheStorage* caches(WorkerGlobalScope&);
-
-private:
- static WorkerGlobalScopeCaches* from(WorkerGlobalScope&);
- static const char* supplementName();
- DOMCacheStorage* caches() const;
-
- WorkerGlobalScope& m_scope;
- mutable RefPtr<DOMCacheStorage> m_caches;
-};
-
-} // namespace WebCore
-
Modified: trunk/Source/WebCore/Sources.txt (278162 => 278163)
--- trunk/Source/WebCore/Sources.txt 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/Sources.txt 2021-05-27 13:26:22 UTC (rev 278163)
@@ -34,9 +34,8 @@
Modules/cache/DOMCache.cpp
Modules/cache/DOMCacheEngine.cpp
Modules/cache/DOMCacheStorage.cpp
-Modules/cache/DOMWindowCaches.cpp
+Modules/cache/WindowOrWorkerGlobalScopeCaches.cpp
Modules/cache/WorkerCacheStorageConnection.cpp
-Modules/cache/WorkerGlobalScopeCaches.cpp
Modules/contact-picker/ContactsManager.cpp
Modules/contact-picker/NavigatorContacts.cpp
Modules/credentialmanagement/BasicCredential.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (278162 => 278163)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-05-27 12:30:13 UTC (rev 278162)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-05-27 13:26:22 UTC (rev 278163)
@@ -1181,9 +1181,8 @@
41CB840125CAB7B30010E2B1 /* RealtimeIncomingVideoSourceCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 41CB840025CAB7B00010E2B1 /* RealtimeIncomingVideoSourceCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
41CB840225CAB81E0010E2B1 /* RealtimeIncomingVideoSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD833A1E4324BB00621E92 /* RealtimeIncomingVideoSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
41D015CA0F4B5C71004A662F /* ContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D015C80F4B5C71004A662F /* ContentType.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 41D129CE1F3D0EF600D15E47 /* WorkerGlobalScopeCaches.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FB278D1F34C28200795487 /* WorkerGlobalScopeCaches.h */; };
+ 41D129CE1F3D0EF600D15E47 /* WindowOrWorkerGlobalScopeCaches.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FB278D1F34C28200795487 /* WindowOrWorkerGlobalScopeCaches.h */; };
41D129D01F3D0F0500D15E47 /* CacheQueryOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FB279B1F34CEF000795487 /* CacheQueryOptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 41D129D11F3D0F0E00D15E47 /* DOMWindowCaches.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FB278C1F34C28200795487 /* DOMWindowCaches.h */; };
41D129D31F3D0F1600D15E47 /* CacheStorageConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D129CC1F3D0EE300D15E47 /* CacheStorageConnection.h */; settings = {ATTRIBUTES = (Private, ); }; };
41D129D51F3D0F6900D15E47 /* CacheStorageProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D129D41F3D0F6600D15E47 /* CacheStorageProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
41D129DB1F3D143800D15E47 /* FetchHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F54F831C50C4F600338488 /* FetchHeaders.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7787,8 +7786,7 @@
41380C231F34369400155FDA /* DOMCache.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = DOMCache.idl; path = Modules/cache/DOMCache.idl; sourceTree = SOURCE_ROOT; };
41380C241F34369700155FDA /* DOMCacheStorage.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = DOMCacheStorage.idl; path = Modules/cache/DOMCacheStorage.idl; sourceTree = SOURCE_ROOT; };
41380C251F34369A00155FDA /* DOMCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DOMCache.h; path = Modules/cache/DOMCache.h; sourceTree = SOURCE_ROOT; };
- 41380C2A1F343E2F00155FDA /* WorkerGlobalScope+Caches.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = "WorkerGlobalScope+Caches.idl"; path = "Modules/cache/WorkerGlobalScope+Caches.idl"; sourceTree = SOURCE_ROOT; };
- 41380C2B1F343E2F00155FDA /* DOMWindow+Caches.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = "DOMWindow+Caches.idl"; path = "Modules/cache/DOMWindow+Caches.idl"; sourceTree = SOURCE_ROOT; };
+ 41380C2A1F343E2F00155FDA /* WindowOrWorkerGlobalScope+Caches.idl */ = {isa = PBXFileReference; lastKnownFileType = text; name = "WindowOrWorkerGlobalScope+Caches.idl"; path = "Modules/cache/WindowOrWorkerGlobalScope+Caches.idl"; sourceTree = SOURCE_ROOT; };
4138D3331244054800323D33 /* EventContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventContext.h; sourceTree = "<group>"; };
4138D3341244054800323D33 /* EventContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventContext.cpp; sourceTree = "<group>"; };
4138F8551D253EEE001CB61E /* JSDOMIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMIterator.cpp; sourceTree = "<group>"; };
@@ -8115,10 +8113,8 @@
41F54F891C50C4F600338488 /* FetchRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FetchRequest.idl; sourceTree = "<group>"; };
41FABD2B1F4DFE42006A6C97 /* DOMCacheEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCacheEngine.h; sourceTree = "<group>"; };
41FABD2E1F4E0251006A6C97 /* DOMCacheEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMCacheEngine.cpp; sourceTree = "<group>"; };
- 41FB278C1F34C28200795487 /* DOMWindowCaches.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMWindowCaches.h; sourceTree = "<group>"; };
- 41FB278D1F34C28200795487 /* WorkerGlobalScopeCaches.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WorkerGlobalScopeCaches.h; sourceTree = "<group>"; };
- 41FB278E1F34C28200795487 /* DOMWindowCaches.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowCaches.cpp; sourceTree = "<group>"; };
- 41FB278F1F34C28200795487 /* WorkerGlobalScopeCaches.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerGlobalScopeCaches.cpp; sourceTree = "<group>"; };
+ 41FB278D1F34C28200795487 /* WindowOrWorkerGlobalScopeCaches.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WindowOrWorkerGlobalScopeCaches.h; sourceTree = "<group>"; };
+ 41FB278F1F34C28200795487 /* WindowOrWorkerGlobalScopeCaches.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WindowOrWorkerGlobalScopeCaches.cpp; sourceTree = "<group>"; };
41FB27991F34CE9C00795487 /* CacheQueryOptions.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = CacheQueryOptions.idl; sourceTree = "<group>"; };
41FB279B1F34CEF000795487 /* CacheQueryOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CacheQueryOptions.h; sourceTree = "<group>"; };
41FCA5F724EAAF15005E1BA6 /* TransformStream.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = TransformStream.idl; sourceTree = "<group>"; };
@@ -19584,15 +19580,12 @@
41380C211F34368D00155FDA /* DOMCacheStorage.cpp */,
41380C221F34369000155FDA /* DOMCacheStorage.h */,
41380C241F34369700155FDA /* DOMCacheStorage.idl */,
- 41380C2B1F343E2F00155FDA /* DOMWindow+Caches.idl */,
- 41FB278E1F34C28200795487 /* DOMWindowCaches.cpp */,
- 41FB278C1F34C28200795487 /* DOMWindowCaches.h */,
418938AF2429F9AB007FDC41 /* RetrieveRecordsOptions.h */,
+ 41380C2A1F343E2F00155FDA /* WindowOrWorkerGlobalScope+Caches.idl */,
+ 41FB278F1F34C28200795487 /* WindowOrWorkerGlobalScopeCaches.cpp */,
+ 41FB278D1F34C28200795487 /* WindowOrWorkerGlobalScopeCaches.h */,
41A7D34F1F438D10008988DE /* WorkerCacheStorageConnection.cpp */,
41A7D3501F438D10008988DE /* WorkerCacheStorageConnection.h */,
- 41380C2A1F343E2F00155FDA /* WorkerGlobalScope+Caches.idl */,
- 41FB278F1F34C28200795487 /* WorkerGlobalScopeCaches.cpp */,
- 41FB278D1F34C28200795487 /* WorkerGlobalScopeCaches.h */,
);
path = cache;
sourceTree = "<group>";
@@ -32388,7 +32381,6 @@
2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */,
1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */,
- 41D129D11F3D0F0E00D15E47 /* DOMWindowCaches.h in Headers */,
51FA2D78152132B300C1BA0B /* DOMWindowExtension.h in Headers */,
97D2AD0414B823A60093DF32 /* DOMWindowProperty.h in Headers */,
AA2A5AD616A4861600975A25 /* DOMWindowSpeechSynthesis.h in Headers */,
@@ -35938,6 +35930,7 @@
9B27FC60234D9ADB00394A46 /* WindowEventLoop.h in Headers */,
BC8243E90D0CFD7500460C8F /* WindowFeatures.h in Headers */,
7E99AF530B13846468FB01A5 /* WindowFocusAllowedIndicator.h in Headers */,
+ 41D129CE1F3D0EF600D15E47 /* WindowOrWorkerGlobalScopeCaches.h in Headers */,
5185FCB41BB4C4E80012898F /* WindowOrWorkerGlobalScopeIndexedDatabase.h in Headers */,
463521AD2081092A00C28922 /* WindowProxy.h in Headers */,
E1E1BF00115FF6FB006F52CA /* WindowsKeyboardCodes.h in Headers */,
@@ -35961,7 +35954,6 @@
91E0DDC4230B41F10019E1E3 /* WorkerDOMDebuggerAgent.h in Headers */,
A7D6B3490F61104500FF9FD1 /* WorkerFontLoadRequest.h in Headers */,
2E4346490F546A8200B0F1BA /* WorkerGlobalScope.h in Headers */,
- 41D129CE1F3D0EF600D15E47 /* WorkerGlobalScopeCaches.h in Headers */,
2E43464B0F546A8200B0F1BA /* WorkerGlobalScopeProxy.h in Headers */,
A54A0C621DB7F8C10017A90B /* WorkerInspectorController.h in Headers */,
A54A0C6C1DB831F90017A90B /* WorkerInspectorProxy.h in Headers */,
