Title: [290817] trunk/Source/WebKit
- Revision
- 290817
- Author
- ross.kirsl...@sony.com
- Date
- 2022-03-03 22:38:04 -0800 (Thu, 03 Mar 2022)
Log Message
REGRESSION(r290815): Fix even more incorrect #if ENABLE(SERVICE_WORKER) usage in NetworkProcess
https://bugs.webkit.org/show_bug.cgi?id=237461
Unreviewed build fix.
* NetworkProcess/NetworkProcess.cpp:
The existence of NetworkProcess::{getPendingPushMessages, processPushMessages} depend on ENABLE(SERVICE_WORKER);
it is only when they exist that their implementation depends on ENABLE(BUILT_IN_NOTIFICATIONS).
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (290816 => 290817)
--- trunk/Source/WebKit/ChangeLog 2022-03-04 06:02:52 UTC (rev 290816)
+++ trunk/Source/WebKit/ChangeLog 2022-03-04 06:38:04 UTC (rev 290817)
@@ -1,3 +1,14 @@
+2022-03-03 Ross Kirsling <ross.kirsl...@sony.com>
+
+ REGRESSION(r290815): Fix even more incorrect #if ENABLE(SERVICE_WORKER) usage in NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=237461
+
+ Unreviewed build fix.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ The existence of NetworkProcess::{getPendingPushMessages, processPushMessages} depend on ENABLE(SERVICE_WORKER);
+ it is only when they exist that their implementation depends on ENABLE(BUILT_IN_NOTIFICATIONS).
+
2022-03-03 Ben Nham <n...@apple.com>
Enforce silent push quota
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (290816 => 290817)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2022-03-04 06:02:52 UTC (rev 290816)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2022-03-04 06:38:04 UTC (rev 290817)
@@ -2232,7 +2232,8 @@
session->storageManager().moveData(dataTypes, oldOrigin, newOrigin, [aggregator] { });
}
-#if ENABLE(SERVICE_WORKER) && ENABLE(BUILT_IN_NOTIFICATIONS)
+#if ENABLE(SERVICE_WORKER)
+#if ENABLE(BUILT_IN_NOTIFICATIONS)
void NetworkProcess::getPendingPushMessages(PAL::SessionID sessionID, CompletionHandler<void(const Vector<WebPushMessage>&)>&& callback)
{
@@ -2276,7 +2277,8 @@
callback(false);
}
-#endif // ENABLE(SERVICE_WORKER) && ENABLE(BUILT_IN_NOTIFICATIONS)
+#endif // ENABLE(BUILT_IN_NOTIFICATIONS)
+#endif // ENABLE(SERVICE_WORKER)
void NetworkProcess::deletePushAndNotificationRegistration(PAL::SessionID sessionID, const SecurityOriginData& origin, CompletionHandler<void(const String&)>&& callback)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
