Changeset 273583 in webkit

Timestamp:

Feb 26, 2021, 1:02:38 PM (6 years ago)

Author:

Andres Gonzalez

Message:

Add AXTextMarkerRangeForNSRange attribute so that Mac clients can access this functionality.
​https://bugs.webkit.org/show_bug.cgi?id=222477
Source/WebCore:

<rdar://problem/74793445>

Reviewed by Chris Fleizach.

This is a follow up to: ​https://bugs.webkit.org/show_bug.cgi?id=222154.
As Chris Fleizach pointed out in the above review, it is necessary to
add a handler in accessibilityAttributeValue:forParameter: for a new AX
attribute in order for clients to access this functionality.

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
(-[WebAccessibilityObjectWrapper textMarkerRangeForNSRange:]): Deleted.

Tools:

Reviewed by Chris Fleizach.

• WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:

(WTR::AccessibilityUIElement::textMarkerRangeForRange):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-26  Andres Gonzalez  <andresg_22@apple.com>
+
+        Add AXTextMarkerRangeForNSRange attribute so that Mac clients can access this functionality.
+        https://bugs.webkit.org/show_bug.cgi?id=222477
+        <rdar://problem/74793445>
+
+        Reviewed by Chris Fleizach.
+
+        This is a follow up to: https://bugs.webkit.org/show_bug.cgi?id=222154.
+        As Chris Fleizach pointed out in the above review, it is necessary to
+        add a handler in accessibilityAttributeValue:forParameter: for a new AX
+        attribute in order for clients to access this functionality.
+
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
+        (-[WebAccessibilityObjectWrapper textMarkerRangeForNSRange:]): Deleted.
+
 2021-02-26  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -3453 +3453 @@
 }
 
-- (AXTextMarkerRangeRef)textMarkerRangeForNSRange:(const NSRange&)range
-{
-    auto* backingObject = self.updateObjectBackingStore;
-    return backingObject ? backingObject->textMarkerRangeForNSRange(range) : nil;
-}
-
 // FIXME: No reason for this to be a method instead of a function; can get document from range.
 - (NSRange)_convertToNSRange:(const SimpleRange&)range
@@ -3835 +3829 @@
     }
 
+    // TextMarker attributes.
+
     if ([attribute isEqualToString:NSAccessibilityEndTextMarkerForBoundsParameterizedAttribute]) {
         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&rect, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
@@ -3868 +3864 @@
         });
     }
+
+    // TextMarkerRange attributes.
+    if ([attribute isEqualToString:@"AXTextMarkerRangeForNSRange"])
+        return (id)backingObject->textMarkerRangeForNSRange(range);
 
     if ([attribute isEqualToString:NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute])

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-26  Andres Gonzalez  <andresg_22@apple.com>
+
+        Add AXTextMarkerRangeForNSRange attribute so that Mac clients can access this functionality.
+        https://bugs.webkit.org/show_bug.cgi?id=222477
+
+        Reviewed by Chris Fleizach.
+
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+        (WTR::AccessibilityUIElement::textMarkerRangeForRange):
+
 2021-02-26  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm

@@ -84 +84 @@
 - (BOOL)accessibilityReplaceRange:(NSRange)range withText:(NSString *)string;
 - (BOOL)accessibilityInsertText:(NSString *)text;
-- (id)textMarkerRangeForNSRange:(const NSRange&)nsRange;
 - (NSArray *)accessibilityArrayAttributeValues:(NSString *)attribute index:(NSUInteger)index maxCount:(NSUInteger)maxCount;
 - (NSUInteger)accessibilityIndexOfChild:(id)child;
@@ -1829 +1828 @@
 {
     BEGIN_AX_OBJC_EXCEPTIONS
-    return AccessibilityTextMarkerRange::create([m_element textMarkerRangeForNSRange:NSMakeRange(location, length)]);
+    return AccessibilityTextMarkerRange::create([m_element accessibilityAttributeValue:@"AXTextMarkerRangeForNSRange"
+        forParameter:[NSValue valueWithRange:NSMakeRange(location, length)]]);
     END_AX_OBJC_EXCEPTIONS