Changeset 291006 in webkit

Timestamp:

Mar 8, 2022 12:46:24 PM (2 years ago)

Author:

pvollan@apple.com

Message:

The accessibility library should be soft linked optionally
​https://bugs.webkit.org/show_bug.cgi?id=236513

Reviewed by Geoffrey Garen.

The accessibility library should be soft linked optionally, since it is not always present.

• Shared/Cocoa/AuxiliaryProcessCocoa.mm:

(WebKit::handleAXPreferenceChange):
(WebKit::AuxiliaryProcess::handlePreferenceChange):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/AuxiliaryProcessCocoa.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-03-08  Per Arne Vollan  <pvollan@apple.com>
+
+        The accessibility library should be soft linked optionally
+        https://bugs.webkit.org/show_bug.cgi?id=236513
+
+        Reviewed by Geoffrey Garen.
+
+        The accessibility library should be soft linked optionally, since it is not always present.
+
+        * Shared/Cocoa/AuxiliaryProcessCocoa.mm:
+        (WebKit::handleAXPreferenceChange):
+        (WebKit::AuxiliaryProcess::handlePreferenceChange):
+
 2022-03-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm

@@ -47 +47 @@
 
 #if HAVE(UPDATE_WEB_ACCESSIBILITY_SETTINGS) && ENABLE(CFPREFS_DIRECT_MODE)
-SOFT_LINK_LIBRARY(libAccessibility)
+SOFT_LINK_LIBRARY_OPTIONAL(libAccessibility)
 SOFT_LINK_OPTIONAL(libAccessibility, _AXSUpdateWebAccessibilitySettings, void, (), ());
 #endif
@@ -198 +198 @@
 #endif
 
-void AuxiliaryProcess::handlePreferenceChange(const String& domain, const String& key, id value)
-{
+static void handleAXPreferenceChange(const String& domain, const String& key, id value)
+{
+#if HAVE(UPDATE_WEB_ACCESSIBILITY_SETTINGS)
+    if (!liblibAccessibility())
+        return;
+#endif
+
     if (domain == String(kAXSAccessibilityPreferenceDomain)) {
 #if HAVE(UPDATE_WEB_ACCESSIBILITY_SETTINGS)
@@ -213 +218 @@
 #endif
     }
-
+}
+
+void AuxiliaryProcess::handlePreferenceChange(const String& domain, const String& key, id value)
+{
+    handleAXPreferenceChange(domain, key, value);
     dispatchSimulatedNotificationsForPreferenceChange(key);
 }