Changeset 268831 in webkit

Timestamp:

Oct 21, 2020, 3:15:49 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r268084. rdar://problem/70541921

AX: Expose lineRangeForPosition for iOS Accessibility code
​https://bugs.webkit.org/show_bug.cgi?id=217256
<rdar://problem/67478962>

Reviewed by Zalan Bujtas.

Expose the existing lineRangeForPosition method for iOS accessibility.

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: (-[WebAccessibilityObjectWrapper lineMarkersForMarker:]):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@268084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (1 diff)

branches/safari-610-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r268084. rdar://problem/70541921
+
+    AX: Expose lineRangeForPosition for iOS Accessibility code
+    https://bugs.webkit.org/show_bug.cgi?id=217256
+    <rdar://problem/67478962>
+    
+    Reviewed by Zalan Bujtas.
+    
+    Expose the existing lineRangeForPosition method for iOS accessibility.
+    
+    * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+    (-[WebAccessibilityObjectWrapper lineMarkersForMarker:]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268084 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-06  Chris Fleizach  <cfleizach@apple.com>
+
+            AX: Expose lineRangeForPosition for iOS Accessibility code
+            https://bugs.webkit.org/show_bug.cgi?id=217256
+            <rdar://problem/67478962>
+
+            Reviewed by Zalan Bujtas.
+
+            Expose the existing lineRangeForPosition method for iOS accessibility.
+
+            * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+            (-[WebAccessibilityObjectWrapper lineMarkersForMarker:]):
+
 2020-10-21  Russell Epstein  <repstein@apple.com>
 

branches/safari-610-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

@@ -2676 +2676 @@
 }
 
+// Returns start/end markers for the line based on position
+- (NSArray<WebAccessibilityTextMarker *> *)lineMarkersForMarker:(WebAccessibilityTextMarker *)marker
+{
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
+    if (!marker)
+        return nil;
+
+    auto range = self.axBackingObject->lineRangeForPosition([marker visiblePosition]);
+    auto* startMarker = [WebAccessibilityTextMarker textMarkerWithVisiblePosition:range.start cache:self.axBackingObject->axObjectCache()];
+    auto* endMarker = [WebAccessibilityTextMarker textMarkerWithVisiblePosition:range.end cache:self.axBackingObject->axObjectCache()];
+    if (!startMarker || !endMarker)
+        return nil;
+    
+    return @[ startMarker, endMarker ];
+}
+
 // This method is intended to return the marker at the start of the line starting at
 // the marker that is passed into the method.