Changeset 285841 in webkit

Timestamp:

Nov 15, 2021, 5:03:00 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

_AXSCopyPathForAccessibilityBundle is going to be deprecated.
​https://bugs.webkit.org/show_bug.cgi?id=233081

Patch by Eric Liang <​ericliang@apple.com> on 2021-11-15
Reviewed by Andres Gonzalez.

To support macOS Accessibility v2 runtime, on macOS there are two places where bundles can live. By doing so, _AXSCopyPathForAccessibilityBundle will going to be deprecated because it won’t always return the correct path you would expect.

Source/WebKit:

• Platform/spi/Cocoa/AccessibilitySupportSPI.h:
• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::webProcessLoaderAccessibilityBundlePath):

Source/WTF:

• wtf/PlatformHave.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/spi/Cocoa/AccessibilitySupportSPI.h (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-11-15  Eric Liang  <ericliang@apple.com>
+
+        _AXSCopyPathForAccessibilityBundle is going to be deprecated.
+        https://bugs.webkit.org/show_bug.cgi?id=233081
+
+        Reviewed by Andres Gonzalez.
+
+        To support macOS Accessibility v2 runtime, on macOS there are two places where bundles can live. By doing so, `_AXSCopyPathForAccessibilityBundle` will going to be deprecated because it won’t always return the correct path you would expect.
+
+        * wtf/PlatformHave.h:
+
 2021-11-15  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -418 +418 @@
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
-#define HAVE_ACCESSIBILITY_BUNDLES_PATH 1
-#endif
-
 #if PLATFORM(COCOA)
 #define HAVE_CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY 1

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-15  Eric Liang  <ericliang@apple.com>
+
+        _AXSCopyPathForAccessibilityBundle is going to be deprecated.
+        https://bugs.webkit.org/show_bug.cgi?id=233081
+
+        Reviewed by Andres Gonzalez.
+
+        To support macOS Accessibility v2 runtime, on macOS there are two places where bundles can live. By doing so, `_AXSCopyPathForAccessibilityBundle` will going to be deprecated because it won’t always return the correct path you would expect.
+
+        * Platform/spi/Cocoa/AccessibilitySupportSPI.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::webProcessLoaderAccessibilityBundlePath):
+
 2021-11-15  Michael Catanzaro  <mcatanzaro@gnome.org>
 

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

@@ -39 +39 @@
 extern Boolean _AXSApplicationAccessibilityEnabled();
 extern CFStringRef kAXSApplicationAccessibilityEnabledNotification;
-#if HAVE(ACCESSIBILITY_BUNDLES_PATH)
-extern CFStringRef _AXSCopyPathForAccessibilityBundle(CFStringRef bundle);
-#endif
 
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -549 +549 @@
 static NSString *webProcessLoaderAccessibilityBundlePath()
 {
-#if HAVE(ACCESSIBILITY_BUNDLES_PATH)
-    return adoptCF(_AXSCopyPathForAccessibilityBundle(CFSTR("WebProcessLoader"))).bridgingAutorelease();
-#else
     NSString *path = (__bridge NSString *)GSSystemRootDirectory();
 #if PLATFORM(MACCATALYST)
@@ -557 +554 @@
 #endif
     return [path stringByAppendingPathComponent:@"System/Library/AccessibilityBundles/WebProcessLoader.axbundle"];
-#endif // HAVE(ACCESSIBILITY_BUNDLES_PATH)
 }
 #endif