Fix !ENABLE(SERVICE_WORKER) build following 267251@main

https://bugs.webkit.org/show_bug.cgi?id=260703 Unreviewed build fix. * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WebCore/Modules/cookie-store/CookieStoreManager.cpp: * Source/WebCore/Modules/cookie-store/CookieStoreManager.h: * Source/WebCore/Modules/cookie-store/CookieStoreManager.idl: * Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.cpp: * Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.h: * Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.idl: * Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEventInit.h: * Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEventInit.idl: * Source/WebCore/dom/EventNames.in: Canonical link: https://commits.webkit.org/267269@main
WebKit · Aug 25, 2023 · f93b5aa · f93b5aa
1 parent 9e05696
commit f93b5aa
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 4 deletions.
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
@@ -1807,6 +1807,7 @@ CookieStoreAPIExtendedAttributesEnabled:
 CookieStoreAPIServiceWorkerEnabled:
   type: bool
   category: dom
+  condition: ENABLE(SERVICE_WORKER)
   status: testable
   humanReadableName: "Cookie Store API for Service Workers"
   humanReadableDescription: "Enable Cookie Store API for Service Workers"

diff --git a/Source/WebCore/Modules/cookie-store/CookieStoreManager.cpp b/Source/WebCore/Modules/cookie-store/CookieStoreManager.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "CookieStoreManager.h"
 
+#if ENABLE(SERVICE_WORKER)
+
 #include "CookieStoreGetOptions.h"
 #include "JSDOMPromiseDeferred.h"
 #include <wtf/Ref.h>
@@ -58,3 +60,5 @@ void CookieStoreManager::unsubscribe(Vector<CookieStoreGetOptions>&&, Ref<Deferr
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(SERVICE_WORKER)
diff --git a/Source/WebCore/Modules/cookie-store/CookieStoreManager.h b/Source/WebCore/Modules/cookie-store/CookieStoreManager.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#if ENABLE(SERVICE_WORKER)
+
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 
@@ -47,3 +49,5 @@ class CookieStoreManager : public RefCounted<CookieStoreManager> {
 };
 
 } // namespace WebCore
+
+#endif // ENABLE(SERVICE_WORKER)
diff --git a/Source/WebCore/Modules/cookie-store/CookieStoreManager.idl b/Source/WebCore/Modules/cookie-store/CookieStoreManager.idl
@@ -23,9 +23,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
- // https://wicg.github.io/cookie-store/#cookiestoremanager
+// https://wicg.github.io/cookie-store/#cookiestoremanager
 
- [
+[
+    Conditional=SERVICE_WORKER,
     EnabledBySetting=CookieStoreAPIEnabled&CookieStoreAPIServiceWorkerEnabled,
     Exposed=(ServiceWorker,Window),
     SecureContext

diff --git a/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.cpp b/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "ExtendableCookieChangeEvent.h"
 
+#if ENABLE(SERVICE_WORKER)
+
 #include "CookieListItem.h"
 #include "ExtendableCookieChangeEventInit.h"
 #include <wtf/IsoMallocInlines.h>
@@ -55,3 +57,5 @@ EventInterface ExtendableCookieChangeEvent::eventInterface() const
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(SERVICE_WORKER)
diff --git a/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.h b/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#if ENABLE(SERVICE_WORKER)
+
 #include "ExtendableCookieChangeEventInit.h"
 #include "ExtendableEvent.h"
 #include <wtf/IsoMalloc.h>
@@ -55,3 +57,5 @@ class ExtendableCookieChangeEvent final : public ExtendableEvent {
 };
 
 } // namespace WebCore
+
+#endif // ENABLE(SERVICE_WORKER)
diff --git a/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.idl b/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEvent.idl
@@ -26,6 +26,7 @@
 // https://wicg.github.io/cookie-store/#extendablecookiechangeevent
 
 [
+    Conditional=SERVICE_WORKER,
     EnabledBySetting=CookieStoreAPIEnabled&CookieStoreAPIServiceWorkerEnabled,
     Exposed=ServiceWorker
 ] interface ExtendableCookieChangeEvent : ExtendableEvent {

diff --git a/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEventInit.h b/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEventInit.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#if ENABLE(SERVICE_WORKER)
+
 #include "CookieListItem.h"
 #include "ExtendableEventInit.h"
 #include <wtf/Vector.h>
@@ -37,3 +39,5 @@ struct ExtendableCookieChangeEventInit : ExtendableEventInit {
 };
 
 } // namespace WebCore
+
+#endif // ENABLE(SERVICE_WORKER)
diff --git a/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEventInit.idl b/Source/WebCore/Modules/cookie-store/ExtendableCookieChangeEventInit.idl
@@ -27,7 +27,9 @@
 
 typedef sequence<CookieListItem> CookieList;
 
-dictionary ExtendableCookieChangeEventInit : ExtendableEventInit {
+[
+    Conditional=SERVICE_WORKER,
+] dictionary ExtendableCookieChangeEventInit : ExtendableEventInit {
   CookieList changed;
   CookieList deleted;
 };
diff --git a/Source/WebCore/dom/EventNames.in b/Source/WebCore/dom/EventNames.in
@@ -19,7 +19,7 @@ CSSAnimationEvent
 CSSTransitionEvent
 CustomEvent
 DragEvent
-ExtendableCookieChangeEvent
+ExtendableCookieChangeEvent conditional=SERVICE_WORKER
 ExtendableEvent conditional=SERVICE_WORKER
 ExtendableMessageEvent conditional=SERVICE_WORKER
 ErrorEvent