Changeset 204563 in webkit


Ignore:
Timestamp:
Aug 17, 2016, 11:01:41 AM (9 years ago)
Author:
Chris Fleizach
Message:

AX: Support abbreviations in iOS
​https://bugs.webkit.org/show_bug.cgi?id=160907

Reviewed by Joanmarie Diggs.

Source/WebCore:

Expose the expandedTextValue attribute for iOS, so that VoiceOver can speak abbreviations correctly.

Test: accessibility/ios-simulator/abbreviation.html

  • accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper textMarkersForRange:]):
(-[WebAccessibilityObjectWrapper accessibilityExpandedTextValue]):
(-[WebAccessibilityObjectWrapper accessibilityIdentifier]):

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(AXAttributeStringSetSpelling):
(AXAttributeStringSetExpandedTextValue):
(AXAttributedStringAppendText):
(AXAttributeStringSetexpandedTextValue): Deleted.

Tools:

  • DumpRenderTree/ios/AccessibilityUIElementIOS.mm:

(AccessibilityUIElement::stringAttributeValue):

  • WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:

(WTR::AccessibilityUIElement::stringAttributeValue):

LayoutTests:

  • accessibility/ios-simulator/abbreviation-expected.txt: Added.
  • accessibility/ios-simulator/abbreviation.html: Added.
Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r204554 r204563  
     12016-08-17  Chris Fleizach  <cfleizach@apple.com>
     2
     3        AX: Support abbreviations in iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=160907
     5
     6        Reviewed by Joanmarie Diggs.
     7
     8        * accessibility/ios-simulator/abbreviation-expected.txt: Added.
     9        * accessibility/ios-simulator/abbreviation.html: Added.
     10
    1112016-08-16  Simon Fraser  <simon.fraser@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r204560 r204563  
     12016-08-17  Chris Fleizach  <cfleizach@apple.com>
     2
     3        AX: Support abbreviations in iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=160907
     5
     6        Reviewed by Joanmarie Diggs.
     7
     8        Expose the expandedTextValue attribute for iOS, so that VoiceOver can speak abbreviations correctly.
     9
     10        Test: accessibility/ios-simulator/abbreviation.html
     11
     12        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
     13        (-[WebAccessibilityObjectWrapper textMarkersForRange:]):
     14        (-[WebAccessibilityObjectWrapper accessibilityExpandedTextValue]):
     15        (-[WebAccessibilityObjectWrapper accessibilityIdentifier]):
     16        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     17        (AXAttributeStringSetSpelling):
     18        (AXAttributeStringSetExpandedTextValue):
     19        (AXAttributedStringAppendText):
     20        (AXAttributeStringSetexpandedTextValue): Deleted.
     21
    1222016-08-17  Antti Koivisto  <antti@apple.com>
    223

  • trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

    r203955 r204563  
    25932593}
    25942594
     2595- (NSString *)accessibilityExpandedTextValue
     2596{
     2597    if (![self _prepareAccessibilityCall])
     2598        return nil;
     2599    return m_object->expandedTextValue();
     2600}
     2601
    25952602- (NSString *)accessibilityIdentifier
    25962603{

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

    r203711 r204563  
    11951195}
    11961196
    1197 static void AXAttributeStringSetexpandedTextValue(NSMutableAttributedString *attrString, RenderObject* renderer, NSRange range)
     1197static void AXAttributeStringSetExpandedTextValue(NSMutableAttributedString *attrString, RenderObject* renderer, NSRange range)
    11981198{
    11991199    if (!renderer || !AXAttributedStringRangeIsValid(attrString, range))
    … …  
    12841284    AXAttributeStringSetHeadingLevel(attrString, renderer, attrStringRange);
    12851285    AXAttributeStringSetBlockquoteLevel(attrString, renderer, attrStringRange);
    1286     AXAttributeStringSetexpandedTextValue(attrString, renderer, attrStringRange);
     1286    AXAttributeStringSetExpandedTextValue(attrString, renderer, attrStringRange);
    12871287    AXAttributeStringSetElement(attrString, NSAccessibilityLinkTextAttribute, AccessibilityObject::anchorElementForNode(node), attrStringRange);
    12881288   

  • trunk/Tools/ChangeLog

    r204559 r204563  
     12016-08-17  Chris Fleizach  <cfleizach@apple.com>
     2
     3        AX: Support abbreviations in iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=160907
     5
     6        Reviewed by Joanmarie Diggs.
     7
     8        * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
     9        (AccessibilityUIElement::stringAttributeValue):
     10        * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
     11        (WTR::AccessibilityUIElement::stringAttributeValue):
     12
    1132016-08-17  Gyuyoung Kim  <gyuyoung.kim@navercorp.com>
    214

  • trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm

    r203955 r204563  
    9797- (id)_accessibilityFieldsetAncestor;
    9898- (BOOL)_accessibilityHasTouchEventListener;
     99- (NSString *)accessibilityExpandedTextValue;
    99100
    100101// TextMarker related
    … …  
    648649    if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
    649650        return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
     651
     652    if (JSStringIsEqualToUTF8CString(attribute, "AXExpandedTextValue"))
     653        return [[m_element accessibilityExpandedTextValue] createJSStringRef];
    650654   
    651655    return JSStringCreateWithCharacters(0, 0);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm

    r204062 r204563  
    7474- (id)_accessibilityFieldsetAncestor;
    7575- (BOOL)_accessibilityHasTouchEventListener;
     76- (NSString *)accessibilityExpandedTextValue;
    7677
    7778// TextMarker related
    … …  
    340341    if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
    341342        return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
    342    
     343
     344    if (JSStringIsEqualToUTF8CString(attribute, "AXExpandedTextValue"))
     345        return [[m_element accessibilityExpandedTextValue] createJSStringRef];
     346
    343347    return JSStringCreateWithCharacters(0, 0);
    344348}
Note: See TracChangeset for help on using the changeset viewer.