[webkit-changes] [WebKit/WebKit] 13f559: AX: Retire accessibility PlainTextRange and use Ch...

AndresGonzalezApple noreply at github.com
Tue May 23 19:55:39 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 13f559711a81abd22b783600c55fe4ed4e81ee7f
      https://github.com/WebKit/WebKit/commit/13f559711a81abd22b783600c55fe4ed4e81ee7f
  Author: Andres Gonzalez <andresg_22 at apple.com>
  Date:   2023-05-23 (Tue, 23 May 2023)

  Changed paths:
    M Source/WebCore/accessibility/AccessibilityObject.cpp
    M Source/WebCore/accessibility/AccessibilityObject.h
    M Source/WebCore/accessibility/AccessibilityObjectInterface.h
    M Source/WebCore/accessibility/AccessibilityRenderObject.cpp
    M Source/WebCore/accessibility/AccessibilityRenderObject.h
    M Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp
    M Source/WebCore/accessibility/cocoa/AccessibilityObjectCocoa.mm
    M Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
    M Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp
    M Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h
    M Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm
    M Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
    M Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp

  Log Message:
  -----------
  AX: Retire accessibility PlainTextRange and use CharacterRange instead.
https://bugs.webkit.org/show_bug.cgi?id=255802
<rdar://problem/108380311>

Reviewed by Tyler Wilcock and Carlos Garcia Campos.

This patch removes the PlainTextRange struct defined in AccessibilityObjectInterface.h and use CharacterRange instead. This eliminates the duplication of code implementing the same functionality and takes advantage of a few features of CharacterRange like operator NSRange. Some code clean up.

* Source/WebCore/accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::visiblePositionRangeForRange const):
(WebCore::AccessibilityObject::rangeForCharacterRange const):
(WebCore::AccessibilityObject::plainTextRangeForVisiblePositionRange const):
(WebCore::AccessibilityObject::characterRangeForPoint const):
(WebCore::AccessibilityObject::doAXStyleRangeForIndex const):
(WebCore::AccessibilityObject::replaceTextInRange):
(WebCore::AccessibilityObject::rangeForPlainTextRange const): Deleted.
(WebCore::AccessibilityObject::doAXRangeForPosition const): Deleted.
* Source/WebCore/accessibility/AccessibilityObject.h:
* Source/WebCore/accessibility/AccessibilityObjectInterface.h:
(WebCore::PlainTextRange::PlainTextRange): Deleted.
(WebCore::PlainTextRange::isNull const): Deleted.
* Source/WebCore/accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::documentBasedSelectedTextRange const):
(WebCore::AccessibilityRenderObject::selectedTextRange const):
(WebCore::AccessibilityRenderObject::setSelectedTextRange):
(WebCore::AccessibilityRenderObject::doAXRangeForLine const):
(WebCore::AccessibilityRenderObject::doAXRangeForIndex const):
(WebCore::AccessibilityRenderObject::doAXStringForRange const):
(WebCore::AccessibilityRenderObject::doAXBoundsForRange const):
(WebCore::AccessibilityRenderObject::doAXBoundsForRangeUsingCharacterOffset const):
* Source/WebCore/accessibility/AccessibilityRenderObject.h:
* Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp:
(WebCore::AccessibilityObjectAtspi::boundsForRange const):
(WebCore::AccessibilityObjectAtspi::setSelectedRange):
(WebCore::AccessibilityObjectAtspi::scrollToMakeVisible const):
(WebCore::AccessibilityObjectAtspi::scrollToPoint const):
* Source/WebCore/accessibility/cocoa/AccessibilityObjectCocoa.mm:
(WebCore::PlainTextRange::PlainTextRange): Deleted.
* Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilitySelectedTextRange]):
(-[WebAccessibilityObjectWrapper _accessibilitySetSelectedTextRange:]):
(-[WebAccessibilityObjectWrapper accessibilityReplaceRange:withText:]):
* Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:
(WebCore::AXIsolatedObject::setSelectedTextRange):
(WebCore::AXIsolatedObject::rangeForCharacterRange const):
(WebCore::AXIsolatedObject::replaceTextInRange):
(WebCore::AXIsolatedObject::makeRangeVisible):
(WebCore::AXIsolatedObject::selectedTextRange const):
(WebCore::AXIsolatedObject::doAXRangeForLine const):
(WebCore::AXIsolatedObject::doAXStringForRange const):
(WebCore::AXIsolatedObject::characterRangeForPoint const):
(WebCore::AXIsolatedObject::doAXRangeForIndex const):
(WebCore::AXIsolatedObject::doAXStyleRangeForIndex const):
(WebCore::AXIsolatedObject::doAXBoundsForRange const):
(WebCore::AXIsolatedObject::doAXBoundsForRangeUsingCharacterOffset const):
(WebCore::AXIsolatedObject::visiblePositionRangeForRange const):
(WebCore::AXIsolatedObject::rangeForPlainTextRange const): Deleted.
(WebCore::AXIsolatedObject::doAXRangeForPosition const): Deleted.
* Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h:
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
(-[WebAccessibilityObjectWrapper accessibilityReplaceRange:withText:]):
(-[WebAccessibilityObjectWrapper _accessibilitySetValue:forAttribute:]):
(-[WebAccessibilityObjectWrapper doAXAttributedStringForRange:]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
* Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp:
(WebCore::AccessibilityObjectWrapper::accessibilityAttributeValue):

Canonical link: https://commits.webkit.org/264452@main




More information about the webkit-changes mailing list