Title: [295694] trunk
- Revision
- 295694
- Author
- j_pas...@apple.com
- Date
- 2022-06-21 15:11:33 -0700 (Tue, 21 Jun 2022)
Log Message
NotificationEventEnabled should be enabled macOS Ventura+
https://bugs.webkit.org/show_bug.cgi?id=241605
rdar://94441142
Reviewed by Alex Christensen.
* Source/WTF/wtf/PlatformEnable.h:
This API should only be enabled on macOS 13 and later.
* LayoutTests/TestExpectations:
* LayoutTests/platform/mac-wk2/TestExpectations:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm:
Update test expectations to account for these being macOS Ventura+
Canonical link: https://commits.webkit.org/251699@main
Modified Paths
Diff
Modified: trunk/LayoutTests/TestExpectations (295693 => 295694)
--- trunk/LayoutTests/TestExpectations 2022-06-21 22:08:27 UTC (rev 295693)
+++ trunk/LayoutTests/TestExpectations 2022-06-21 22:11:33 UTC (rev 295694)
@@ -1145,6 +1145,17 @@
webanimations/frame-rate [ Skip ]
+# NOTIFICATION_EVENT is Ventura+
+http/tests/workers/service/shownotification-allowed-document.html [ Skip ]
+http/tests/workers/service/shownotification-allowed.html [ Skip ]
+http/tests/workers/service/shownotification-invalid-data.html [ Skip ]
+http/wpt/push-api/pushEvent.any.serviceworker.html [ Skip ]
+imported/w3c/web-platform-tests/notifications/idlharness.https.any.html [ Skip ]
+imported/w3c/web-platform-tests/notifications/idlharness.https.any.serviceworker.html [ Skip ]
+imported/w3c/web-platform-tests/notifications/idlharness.https.any.worker.html [ Skip ]
+http/tests/workers/service/getnotifications-stop.html [ Skip ]
+http/tests/workers/service/getnotifications.html [ Skip ]
+
#//////////////////////////////////////////////////////////////////////////////////////////
# End platform-specific tests.
#//////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (295693 => 295694)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2022-06-21 22:08:27 UTC (rev 295693)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2022-06-21 22:11:33 UTC (rev 295694)
@@ -1717,3 +1717,14 @@
webkit.org/b/241265 [ Debug ] imported/w3c/web-platform-tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html [ Pass Crash ]
webkit.org/b/241283 fast/animation/request-animation-frame-throttling-detached-iframe.html [ Pass Failure ]
+
+# NOTIFICATION_EVENT is Ventura+
+[ Ventura+ ] http/tests/workers/service/shownotification-allowed-document.html [ Pass ]
+[ Ventura+ ] http/tests/workers/service/shownotification-allowed.html [ Pass ]
+[ Ventura+ ] http/tests/workers/service/shownotification-invalid-data.html [ Pass ]
+[ Ventura+ ] http/wpt/push-api/pushEvent.any.serviceworker.html [ Pass ]
+[ Ventura+ ] imported/w3c/web-platform-tests/notifications/idlharness.https.any.html [ Pass ]
+[ Ventura+ ] imported/w3c/web-platform-tests/notifications/idlharness.https.any.serviceworker.html [ Pass ]
+[ Ventura+ ] imported/w3c/web-platform-tests/notifications/idlharness.https.any.worker.html [ Pass ]
+[ Ventura+ ] http/tests/workers/service/getnotifications-stop.html [ Pass ]
+[ Ventura+ ] http/tests/workers/service/getnotifications.html [ Pass ]
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (295693 => 295694)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2022-06-21 22:08:27 UTC (rev 295693)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2022-06-21 22:11:33 UTC (rev 295694)
@@ -956,7 +956,8 @@
#error "ENABLE(WEBXR_HANDS) requires ENABLE(WEBXR)"
#endif
-#if ENABLE(SERVICE_WORKER) && ENABLE(NOTIFICATIONS)
+#if ENABLE(SERVICE_WORKER) && ENABLE(NOTIFICATIONS) \
+ && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000
#if !defined(ENABLE_NOTIFICATION_EVENT)
#define ENABLE_NOTIFICATION_EVENT 1
#endif
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm (295693 => 295694)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm 2022-06-21 22:08:27 UTC (rev 295693)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm 2022-06-21 22:11:33 UTC (rev 295694)
@@ -25,7 +25,7 @@
#import "config.h"
-#if ENABLE(NOTIFICATIONS)
+#if ENABLE(NOTIFICATIONS) && ENABLE(NOTIFICATION_EVENT)
#import "DeprecatedGlobalValues.h"
#import "HTTPServer.h"
@@ -729,4 +729,4 @@
#endif // WK_HAVE_C_SPI
-#endif // ENABLE(NOTIFICATIONS)
+#endif // ENABLE(NOTIFICATIONS) && ENABLE(NOTIFICATION_EVENT)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm (295693 => 295694)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm 2022-06-21 22:08:27 UTC (rev 295693)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm 2022-06-21 22:11:33 UTC (rev 295694)
@@ -46,7 +46,7 @@
#import <wtf/BlockPtr.h>
#import <wtf/text/Base64.h>
-#if ENABLE(NOTIFICATIONS) && (PLATFORM(MAC) || PLATFORM(IOS))
+#if ENABLE(NOTIFICATIONS) && ENABLE(NOTIFICATION_EVENT) && (PLATFORM(MAC) || PLATFORM(IOS))
using WebKit::WebPushD::MessageType;
@@ -1231,4 +1231,4 @@
} // namespace TestWebKitAPI
-#endif // ENABLE(NOTIFICATIONS) && (PLATFORM(MAC) || PLATFORM(IOS))
+#endif // ENABLE(NOTIFICATIONS) && ENABLE(NOTIFICATION_EVENT) && (PLATFORM(MAC) || PLATFORM(IOS))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
