Changeset 277201 in webkit

Timestamp:

May 7, 2021, 2:42:28 PM (5 years ago)

Author:

Brent Fulgham

Message:

[iOS] Make AccessibilityReduceMotion test case work on iOS
​https://bugs.webkit.org/show_bug.cgi?id=225244
<rdar://problem/77589455>

New tests for Accessibility-related features were added in Bug 215664, but only for macOS.
We support these same features on iOS, and should have test coverage.

Reviewed by Per Arne Vollan.

Source/WebKit:

Tested by AccessibilityReduceMotion.mm.

• Platform/spi/Cocoa/AccessibilitySupportSPI.h:

Tools:

• TestWebKitAPI/Tests/WebKit/AccessibilityReduceMotion.mm:

(notificationCallback):
(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Platform/spi/Cocoa/AccessibilitySupportSPI.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/xcshareddata/xcschemes/TestWebKitAPI.xcscheme (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit/AccessibilityReduceMotion.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-07  Brent Fulgham  <bfulgham@apple.com>
+
+        [iOS] Make AccessibilityReduceMotion test case work on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=225244
+        <rdar://problem/77589455>
+
+        New tests for Accessibility-related features were added in Bug 215664, but only for macOS.
+        We support these same features on iOS, and should have test coverage.
+
+        Reviewed by Per Arne Vollan.
+
+        Tested by AccessibilityReduceMotion.mm.
+
+        * Platform/spi/Cocoa/AccessibilitySupportSPI.h:
+
 2021-05-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/Platform/spi/Cocoa/AccessibilitySupportSPI.h

@@ -41 +41 @@
 #endif
 
+#if PLATFORM(IOS_FAMILY)
+extern CFStringRef kAXSReduceMotionPreference;
+extern CFStringRef kAXSReduceMotionChangedNotification;
+#endif
+
 #if PLATFORM(IOS_FAMILY) && ENABLE(FULL_KEYBOARD_ACCESS)
 extern CFStringRef kAXSFullKeyboardAccessEnabledNotification;

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-07  Brent Fulgham  <bfulgham@apple.com>
+
+        [iOS] Make AccessibilityReduceMotion test case work on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=225244
+        <rdar://problem/77589455>
+
+        New tests for Accessibility-related features were added in Bug 215664, but only for macOS.
+        We support these same features on iOS, and should have test coverage.
+
+        Reviewed by Per Arne Vollan.
+
+        * TestWebKitAPI/Tests/WebKit/AccessibilityReduceMotion.mm:
+        (notificationCallback):
+        (TEST):
+
 2021-05-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/xcshareddata/xcschemes/TestWebKitAPI.xcscheme

@@ -51 +51 @@
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--gtest_filter=WebKit.AccessibilityReduceMotion"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction

trunk/Tools/TestWebKitAPI/Tests/WebKit/AccessibilityReduceMotion.mm

@@ -26 +26 @@
 #import "config.h"
 
-#if WK_HAVE_C_SPI && ENABLE(CFPREFS_DIRECT_MODE)
+#if ENABLE(CFPREFS_DIRECT_MODE)
 
 #import "PlatformUtilities.h"
 #import "TestWKWebView.h"
+#import "WKWebViewConfigurationExtras.h"
 #import <WebKit/PreferenceObserver.h>
 #import <WebKit/WKProcessPoolPrivate.h>
 #import <WebKit/_WKProcessPoolConfiguration.h>
 
+#if PLATFORM(MAC)
 #import <pal/spi/mac/HIServicesSPI.h>
+#endif
+
+#if PLATFORM(IOS_FAMILY)
+#include <pal/spi/cocoa/AccessibilitySupportSPI.h>
+#include <wtf/SoftLinking.h>
+
+SOFT_LINK_LIBRARY(libAccessibility)
+SOFT_LINK_CONSTANT(libAccessibility, kAXSReduceMotionPreference, CFStringRef);
+SOFT_LINK_CONSTANT(libAccessibility, kAXSReduceMotionChangedNotification, CFStringRef);
+
+#define NOTIFICATION_CENTER CFNotificationCenterGetDarwinNotifyCenter()
+#define REDUCED_MOTION_PREFERENCE getkAXSReduceMotionPreference()
+#define REDUCED_MOTION_CHANGED_NOTIFICATION getkAXSReduceMotionChangedNotification()
+#define ACCESSIBILITY_DOMAIN CFSTR("com.apple.Accessibility")
+#else
+#define NOTIFICATION_CENTER CFNotificationCenterGetDistributedCenter()
+#define REDUCED_MOTION_PREFERENCE kAXInterfaceReduceMotionKey
+#define REDUCED_MOTION_CHANGED_NOTIFICATION kAXInterfaceReduceMotionStatusDidChangeNotification
+#define ACCESSIBILITY_DOMAIN CFSTR("com.apple.universalaccess")
+#endif
 
 static bool reduceMotionNotificationReceived = false;
@@ -51 +73 @@
 @end
 
+static void notificationCallback(CFNotificationCenterRef center, void *observer, CFNotificationName name, const void *object, CFDictionaryRef userInfo)
+{
+    reduceMotionNotificationReceived = true;
+}
+
 TEST(WebKit, AccessibilityReduceMotion)
 {
-    RetainPtr<NSObject> accessibilityObserver = [[NSDistributedNotificationCenter defaultCenter] addObserverForName:(__bridge id)kAXInterfaceReduceMotionStatusDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *note) {
-        reduceMotionNotificationReceived = true;
-    }];
+    CFNotificationCenterAddObserver(NOTIFICATION_CENTER, nullptr, &notificationCallback, REDUCED_MOTION_CHANGED_NOTIFICATION, nullptr, CFNotificationSuspensionBehaviorDeliverImmediately);
 
-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    WKRetainPtr<WKContextRef> context = adoptWK(TestWebKitAPI::Util::createContextForInjectedBundleTest("InternalsInjectedBundleTest"));
-    configuration.get().processPool = (WKProcessPool *)context.get();
-    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get() addToWindow:YES]);
+    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration addToWindow:YES]);
 
-    CFPreferencesSetAppValue(kAXInterfaceReduceMotionKey, kCFBooleanFalse, CFSTR("com.apple.universalaccess"));
+    CFPreferencesSetAppValue(REDUCED_MOTION_PREFERENCE, kCFBooleanFalse, ACCESSIBILITY_DOMAIN);
 
     auto observer = adoptNS([[WKPreferenceObserverForTesting alloc] init]);
@@ -68 +91 @@
     [webView synchronouslyLoadTestPageNamed:@"simple"];
 
-    CFPreferencesSetAppValue(kAXInterfaceReduceMotionKey, kCFBooleanTrue, CFSTR("com.apple.universalaccess"));
-
-    TestWebKitAPI::Util::run(&receivedPreferenceNotification);
-
     auto reduceMotion = [&] {
         return [webView stringByEvaluatingJavaScript:@"window.internals.userPrefersReducedMotion()"].boolValue;
     };
-    
+
+    ASSERT_FALSE(reduceMotion());
+
+    reduceMotionNotificationReceived = false;
+
+    CFPreferencesSetAppValue(REDUCED_MOTION_PREFERENCE, kCFBooleanTrue, ACCESSIBILITY_DOMAIN);
+
+    TestWebKitAPI::Util::run(&receivedPreferenceNotification);
+    TestWebKitAPI::Util::run(&reduceMotionNotificationReceived);
+
     [webView synchronouslyLoadTestPageNamed:@"simple"];
-
-    TestWebKitAPI::Util::run(&reduceMotionNotificationReceived);
 
     ASSERT_TRUE(reduceMotion());
 
-    CFPreferencesSetAppValue(kAXInterfaceReduceMotionKey, nullptr, CFSTR("com.apple.universalaccess"));
+    CFPreferencesSetAppValue(REDUCED_MOTION_PREFERENCE, nullptr, ACCESSIBILITY_DOMAIN);
 
-    [[NSNotificationCenter defaultCenter] removeObserver:accessibilityObserver.get()];
+    CFNotificationCenterRemoveObserver(NOTIFICATION_CENTER, nullptr, REDUCED_MOTION_CHANGED_NOTIFICATION, nullptr);
 }