⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286536 in webkit


Ignore:
Timestamp:
Dec 4, 2021, 8:14:50 PM (5 years ago)
Author:
Andres Gonzalez
Message:

Change WTR::AccessibilityUIElement::descriptionOfValue(id) to return a RetainPtr.
​https://bugs.webkit.org/show_bug.cgi?id=233815
<rdar://problem/86019373>

Reviewed by Chris Fleizach.

This fixes several tests in isolated tree mode, in particular:
accessibility/mac/focus-crash.html
accessibility/mac/search-predicate.html

  • WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
  • WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:

(WTR::AccessibilityUIElement::descriptionOfValue const):
(WTR::AccessibilityUIElement::allAttributes):
(WTR::AccessibilityUIElement::stringDescriptionOfAttributeValue):
(WTR::AccessibilityUIElement::role):
(WTR::AccessibilityUIElement::subrole):
(WTR::AccessibilityUIElement::roleDescription):
(WTR::AccessibilityUIElement::computedRoleString):
(WTR::AccessibilityUIElement::title):
(WTR::AccessibilityUIElement::description):
(WTR::AccessibilityUIElement::orientation const):
(WTR::AccessibilityUIElement::stringValue):
(WTR::AccessibilityUIElement::language):
(WTR::AccessibilityUIElement::helpText const):
(WTR::AccessibilityUIElement::embeddedImageDescription const):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r286522 r286536  
     12021-12-04  Andres Gonzalez  <andresg_22@apple.com>
     2
     3        Change WTR::AccessibilityUIElement::descriptionOfValue(id) to return a RetainPtr.
     4        https://bugs.webkit.org/show_bug.cgi?id=233815
     5        <rdar://problem/86019373>
     6
     7        Reviewed by Chris Fleizach.
     8
     9        This fixes several tests in isolated tree mode, in particular:
     10        accessibility/mac/focus-crash.html
     11        accessibility/mac/search-predicate.html
     12
     13        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
     14        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
     15        (WTR::AccessibilityUIElement::descriptionOfValue const):
     16        (WTR::AccessibilityUIElement::allAttributes):
     17        (WTR::AccessibilityUIElement::stringDescriptionOfAttributeValue):
     18        (WTR::AccessibilityUIElement::role):
     19        (WTR::AccessibilityUIElement::subrole):
     20        (WTR::AccessibilityUIElement::roleDescription):
     21        (WTR::AccessibilityUIElement::computedRoleString):
     22        (WTR::AccessibilityUIElement::title):
     23        (WTR::AccessibilityUIElement::description):
     24        (WTR::AccessibilityUIElement::orientation const):
     25        (WTR::AccessibilityUIElement::stringValue):
     26        (WTR::AccessibilityUIElement::language):
     27        (WTR::AccessibilityUIElement::helpText const):
     28        (WTR::AccessibilityUIElement::embeddedImageDescription const):
     29
    1302021-12-03  Wenson Hsieh  <wenson_hsieh@apple.com>
    231

  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h

    r286298 r286536  
    406406#if PLATFORM(MAC)
    407407    RetainPtr<id> attributeValueForParameter(NSString *, id) const;
    408     NSString *descriptionOfValue(id valueObject) const;
     408    RetainPtr<NSString> descriptionOfValue(id valueObject) const;
    409409#endif
    410410

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

    r286298 r286536  
    170170}
    171171
    172 NSString *AccessibilityUIElement::descriptionOfValue(id valueObject) const
     172RetainPtr<NSString> AccessibilityUIElement::descriptionOfValue(id valueObject) const
    173173{
    174174    if (!valueObject)
    … …  
    589589            continue;
    590590
    591         RetainPtr<NSString> value = descriptionOfValue(attributeValue(attribute).get());
     591        auto value = descriptionOfValue(attributeValue(attribute).get());
    592592        [values appendFormat:@"%@: %@\n", attribute, value.get()];
    593593    }
    … …  
    599599{
    600600    auto value = attributeValue([NSString stringWithJSStringRef:attribute]);
    601     NSString *valueDescription = descriptionOfValue(value.get());
     601    auto valueDescription = descriptionOfValue(value.get());
    602602    return [valueDescription createJSStringRef];
    603603}
    … …  
    731731{
    732732    BEGIN_AX_OBJC_EXCEPTIONS
    733     NSString *role = descriptionOfValue(attributeValue(NSAccessibilityRoleAttribute).get());
    734     return concatenateAttributeAndValue(@"AXRole", role);
     733    auto role = descriptionOfValue(attributeValue(NSAccessibilityRoleAttribute).get());
     734    return concatenateAttributeAndValue(@"AXRole", role.get());
    735735    END_AX_OBJC_EXCEPTIONS
    736736
    … …  
    741741{
    742742    BEGIN_AX_OBJC_EXCEPTIONS
    743     NSString *subrole = descriptionOfValue(attributeValue(NSAccessibilitySubroleAttribute).get());
    744     return concatenateAttributeAndValue(@"AXSubrole", subrole);
     743    auto subrole = descriptionOfValue(attributeValue(NSAccessibilitySubroleAttribute).get());
     744    return concatenateAttributeAndValue(@"AXSubrole", subrole.get());
    745745    END_AX_OBJC_EXCEPTIONS
    746746
    … …  
    751751{
    752752    BEGIN_AX_OBJC_EXCEPTIONS
    753     NSString *role = descriptionOfValue(attributeValue(NSAccessibilityRoleDescriptionAttribute).get());
    754     return concatenateAttributeAndValue(@"AXRoleDescription", role);
     753    auto role = descriptionOfValue(attributeValue(NSAccessibilityRoleDescriptionAttribute).get());
     754    return concatenateAttributeAndValue(@"AXRoleDescription", role.get());
    755755    END_AX_OBJC_EXCEPTIONS
    756756
    … …  
    761761{
    762762    BEGIN_AX_OBJC_EXCEPTIONS
    763     NSString *computedRoleString = descriptionOfValue(attributeValue(@"AXARIARole").get());
     763    auto computedRoleString = descriptionOfValue(attributeValue(@"AXARIARole").get());
    764764    return [computedRoleString createJSStringRef];
    765765    END_AX_OBJC_EXCEPTIONS
    … …  
    771771{
    772772    BEGIN_AX_OBJC_EXCEPTIONS
    773     NSString *title = descriptionOfValue(attributeValue(NSAccessibilityTitleAttribute).get());
    774     return concatenateAttributeAndValue(@"AXTitle", title);
     773    auto title = descriptionOfValue(attributeValue(NSAccessibilityTitleAttribute).get());
     774    return concatenateAttributeAndValue(@"AXTitle", title.get());
    775775    END_AX_OBJC_EXCEPTIONS
    776776
    … …  
    781781{
    782782    BEGIN_AX_OBJC_EXCEPTIONS
    783     NSString *description = descriptionOfValue(attributeValue(NSAccessibilityDescriptionAttribute).get());
    784     return concatenateAttributeAndValue(@"AXDescription", description);
     783    auto description = descriptionOfValue(attributeValue(NSAccessibilityDescriptionAttribute).get());
     784    return concatenateAttributeAndValue(@"AXDescription", description.get());
    785785    END_AX_OBJC_EXCEPTIONS
    786786
    … …  
    791791{
    792792    BEGIN_AX_OBJC_EXCEPTIONS
    793     NSString *description = descriptionOfValue(attributeValue(NSAccessibilityOrientationAttribute).get());
    794     return concatenateAttributeAndValue(@"AXOrientation", description);   
     793    auto description = descriptionOfValue(attributeValue(NSAccessibilityOrientationAttribute).get());
     794    return concatenateAttributeAndValue(@"AXOrientation", description.get());
    795795    END_AX_OBJC_EXCEPTIONS
    796796
    … …  
    802802    BEGIN_AX_OBJC_EXCEPTIONS
    803803    auto value = attributeValue(NSAccessibilityValueAttribute);
    804     NSString *description = descriptionOfValue(value.get());
     804    auto description = descriptionOfValue(value.get());
    805805    if (description)
    806         return concatenateAttributeAndValue(@"AXValue", description);
     806        return concatenateAttributeAndValue(@"AXValue", description.get());
    807807    END_AX_OBJC_EXCEPTIONS
    808808
    … …  
    813813{
    814814    BEGIN_AX_OBJC_EXCEPTIONS
    815     NSString *description = descriptionOfValue(attributeValue(@"AXLanguage").get());
    816     return concatenateAttributeAndValue(@"AXLanguage", description);
     815    auto description = descriptionOfValue(attributeValue(@"AXLanguage").get());
     816    return concatenateAttributeAndValue(@"AXLanguage", description.get());
    817817    END_AX_OBJC_EXCEPTIONS
    818818
    … …  
    823823{
    824824    BEGIN_AX_OBJC_EXCEPTIONS
    825     NSString *description = descriptionOfValue(attributeValue(NSAccessibilityHelpAttribute).get());
    826     return concatenateAttributeAndValue(@"AXHelp", description);
     825    auto description = descriptionOfValue(attributeValue(NSAccessibilityHelpAttribute).get());
     826    return concatenateAttributeAndValue(@"AXHelp", description.get());
    827827    END_AX_OBJC_EXCEPTIONS
    828828   
    … …  
    16891689{
    16901690    BEGIN_AX_OBJC_EXCEPTIONS
    1691     NSString *value = descriptionOfValue(attributeValue(@"AXEmbeddedImageDescription").get());
    1692     return concatenateAttributeAndValue(@"AXEmbeddedImageDescription", value);
     1691    auto value = descriptionOfValue(attributeValue(@"AXEmbeddedImageDescription").get());
     1692    return concatenateAttributeAndValue(@"AXEmbeddedImageDescription", value.get());
    16931693    END_AX_OBJC_EXCEPTIONS
    16941694    return nullptr;
Note: See TracChangeset for help on using the changeset viewer.