[webkit-changes] [WebKit/WebKit] 6423c2: AX: Avoid hitting the main thread for AttributedSt...

AndresGonzalezApple noreply at github.com
Tue Feb 28 05:30:41 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 6423c272af85f822219d05ec8d5d595a45eed03d
      https://github.com/WebKit/WebKit/commit/6423c272af85f822219d05ec8d5d595a45eed03d
  Author: Andres Gonzalez <andresg_22 at apple.com>
  Date:   2023-02-28 (Tue, 28 Feb 2023)

  Changed paths:
    M LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range-expected.txt
    M LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range-with-options-expected.txt
    M LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range-with-options.html
    M LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range.html
    M Source/WebCore/accessibility/AXObjectCache.cpp
    M Source/WebCore/accessibility/AXTextMarker.h
    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/cocoa/AXTextMarkerCocoa.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/AXIsolatedTree.h
    M Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm
    M Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
    M Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

  Log Message:
  -----------
  AX: Avoid hitting the main thread for AttributedString for TextMarkerRange calls in text controls.
https://bugs.webkit.org/show_bug.cgi?id=252924
<rdar://problem/105895024>

Reviewed by Chris Fleizach.

This patch makes the following changes:
- Caches the AttributedString for text controls.
- Using the cached AttributedString, implements attributedStringForTextMarkerRange without having to dispatch to the main thread.
- Added test cases in attributed-string-for-range-with-options.html for when the value of the text control changes.
- Some code cleanup.

* LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range-expected.txt:
* LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range-with-options-expected.txt:
* LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range-with-options.html:
* LayoutTests/accessibility/mac/attributed-string/attributed-string-for-range.html:
* Source/WebCore/accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::characterOffsetForIndex):
* Source/WebCore/accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::simpleRange const):
(WebCore::AccessibilityObject::textMarkerRange const):
(WebCore::AccessibilityObject::visibleCharacterRange const):
(WebCore::AccessibilityObject::findTextRanges const):
(WebCore::AccessibilityObject::elementRange const): Renamed simpleRange() const.
* Source/WebCore/accessibility/AccessibilityObject.h:
* Source/WebCore/accessibility/AccessibilityObjectInterface.h:
* Source/WebCore/accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::linkClickPoint):
(WebCore::AccessibilityRenderObject::setSelectedTextRange):
(WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange const):
(WebCore::AccessibilityRenderObject::text const):
(WebCore::AccessibilityRenderObject::textLength const):
* Source/WebCore/accessibility/AccessibilityRenderObject.h:
* Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper textMarkerRange]):
* Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:
(WebCore::AXIsolatedObject::initializeProperties):
(WebCore::AXIsolatedObject::selectedText const):
(WebCore::AXIsolatedObject::simpleRange const):
(WebCore::AXIsolatedObject::textMarkerRange const):
(WebCore::AXIsolatedObject::elementRange const): Renamed simpleRange() const.
(WebCore::AXIsolatedObject::textLength const):
* Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h:
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(-[WebAccessibilityObjectWrapperBase accessibilityVisibleCharacterRange]):
(-[WebAccessibilityObjectWrapperBase lineRectsAndText]):
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper attributedStringForTextMarkerRange:spellCheck:]):
(-[WebAccessibilityObjectWrapper ALLOW_DEPRECATED_IMPLEMENTATIONS_END]):
(-[WebAccessibilityObjectWrapper doAXRTFForRange:]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
* Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm:
(WebCore::AXIsolatedObject::initializePlatformProperties):
(WebCore::AXIsolatedObject::textLength const):
(WebCore::AXIsolatedObject::convertRectToPlatformSpace const):
(WebCore::AXIsolatedObject::attributedStringForTextMarkerRange const):
(WebCore::AXIsolatedObject::cachedAttributedStringForTextMarkerRange const):
* Source/WebCore/accessibility/AXTextMarker.h:
* Source/WebCore/accessibility/cocoa/AXTextMarkerCocoa.mm:
(WebCore::AXTextMarkerRange::nsRange const):
* Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm:
(WebCore::AXIsolatedObject::attributedStringForTextMarkerRange const):

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




More information about the webkit-changes mailing list