Title: [285841] trunk/Source
Revision
285841
Author
[email protected]
Date
2021-11-15 17:03:00 -0800 (Mon, 15 Nov 2021)

Log Message

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

Patch by Eric Liang <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (285840 => 285841)


--- trunk/Source/WTF/ChangeLog	2021-11-16 00:25:05 UTC (rev 285840)
+++ trunk/Source/WTF/ChangeLog	2021-11-16 01:03:00 UTC (rev 285841)
@@ -1,3 +1,14 @@
+2021-11-15  Eric Liang  <[email protected]>
+
+        _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  <[email protected]>
 
         Unreviewed, fix the internal iOS 15 build

Modified: trunk/Source/WTF/wtf/PlatformHave.h (285840 => 285841)


--- trunk/Source/WTF/wtf/PlatformHave.h	2021-11-16 00:25:05 UTC (rev 285840)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2021-11-16 01:03:00 UTC (rev 285841)
@@ -417,13 +417,6 @@
 #define HAVE_LINK_PREVIEW 1
 #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
 #endif

Modified: trunk/Source/WebKit/ChangeLog (285840 => 285841)


--- trunk/Source/WebKit/ChangeLog	2021-11-16 00:25:05 UTC (rev 285840)
+++ trunk/Source/WebKit/ChangeLog	2021-11-16 01:03:00 UTC (rev 285841)
@@ -1,3 +1,16 @@
+2021-11-15  Eric Liang  <[email protected]>
+
+        _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  <[email protected]>
 
         Make valgrind work properly without extra environment variables

Modified: trunk/Source/WebKit/Platform/spi/Cocoa/AccessibilitySupportSPI.h (285840 => 285841)


--- trunk/Source/WebKit/Platform/spi/Cocoa/AccessibilitySupportSPI.h	2021-11-16 00:25:05 UTC (rev 285840)
+++ trunk/Source/WebKit/Platform/spi/Cocoa/AccessibilitySupportSPI.h	2021-11-16 01:03:00 UTC (rev 285841)
@@ -38,9 +38,6 @@
 extern Boolean _AXSKeyRepeatEnabled();
 extern Boolean _AXSApplicationAccessibilityEnabled();
 extern CFStringRef kAXSApplicationAccessibilityEnabledNotification;
-#if HAVE(ACCESSIBILITY_BUNDLES_PATH)
-extern CFStringRef _AXSCopyPathForAccessibilityBundle(CFStringRef bundle);
-#endif
 
 #if PLATFORM(IOS_FAMILY)
 extern CFStringRef kAXSReduceMotionPreference;

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (285840 => 285841)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-11-16 00:25:05 UTC (rev 285840)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-11-16 01:03:00 UTC (rev 285841)
@@ -548,15 +548,11 @@
 #if PLATFORM(IOS_FAMILY)
 static NSString *webProcessLoaderAccessibilityBundlePath()
 {
-#if HAVE(ACCESSIBILITY_BUNDLES_PATH)
-    return adoptCF(_AXSCopyPathForAccessibilityBundle(CFSTR("WebProcessLoader"))).bridgingAutorelease();
-#else
     NSString *path = (__bridge NSString *)GSSystemRootDirectory();
 #if PLATFORM(MACCATALYST)
     path = [path stringByAppendingPathComponent:@"System/iOSSupport"];
 #endif
     return [path stringByAppendingPathComponent:@"System/Library/AccessibilityBundles/WebProcessLoader.axbundle"];
-#endif // HAVE(ACCESSIBILITY_BUNDLES_PATH)
 }
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to