Changeset 188947 in webkit


Ignore:
Timestamp:
Aug 25, 2015 11:49:45 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

AX: Enable accessibility/aria-controls.html test for mac
​https://bugs.webkit.org/show_bug.cgi?id=148458

Patch by Nan Wang <​n_wang@apple.com> on 2015-08-25
Reviewed by Chris Fleizach.

Source/WebCore:

Re-enabled accessibility/aria-controls.html test for mac.

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):

Tools:

Implemented ariaControlsElementAtIndex(unsigned index).

  • DumpRenderTree/mac/AccessibilityUIElementMac.mm:

(AccessibilityUIElement::ariaControlsElementAtIndex):
(AccessibilityUIElement::disclosedRowAtIndex):

  • WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:

(WTR::AccessibilityUIElement::ariaControlsElementAtIndex):

LayoutTests:

  • accessibility/aria-controls.html:
  • platform/mac/TestExpectations:
  • platform/mac/accessibility/aria-controls-expected.txt: Added.
Location:
trunk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r188944 r188947  
     12015-08-25  Nan Wang  <n_wang@apple.com>
     2
     3        AX: Enable accessibility/aria-controls.html test for mac
     4        https://bugs.webkit.org/show_bug.cgi?id=148458
     5
     6        Reviewed by Chris Fleizach.
     7
     8        * accessibility/aria-controls.html:
     9        * platform/mac/TestExpectations:
     10        * platform/mac/accessibility/aria-controls-expected.txt: Added.
     11
    1122015-08-25  Myles C. Maxfield  <mmaxfield@apple.com>
    213

  • trunk/LayoutTests/accessibility/aria-controls.html

    r163296 r188947  
    2323        var tab1 = tablist.childAtIndex(0);
    2424
    25         shouldBe("tab1.ariaControlsElementAtIndex(0).stringValue", "'AXValue: Panel 1'");
    26         shouldBe("tab1.ariaControlsElementAtIndex(1).stringValue", "'AXValue: Panel 2'");
     25        if (accessibilityController.platformName == "mac") {
     26            shouldBe("tab1.ariaControlsElementAtIndex(0).childAtIndex(0).stringValue", "'AXValue: Panel 1'");
     27            shouldBe("tab1.ariaControlsElementAtIndex(1).childAtIndex(0).stringValue", "'AXValue: Panel 2'");
     28        } else {
     29            shouldBe("tab1.ariaControlsElementAtIndex(0).stringValue", "'AXValue: Panel 1'");
     30            shouldBe("tab1.ariaControlsElementAtIndex(1).stringValue", "'AXValue: Panel 2'");
     31        }
    2732    }
    2833

  • trunk/LayoutTests/platform/mac/TestExpectations

    r188941 r188947  
    4747# Missing implementation of some functions in mac.
    4848webkit.org/b/129039 accessibility/select-element-at-index.html [ Skip ]
    49 
    50 # ariaControlsElementAtIndex is not implemented in mac
    51 webkit.org/b/127908 accessibility/aria-controls.html [ Skip ]
    5249
    5350# Need to add functionality to DumpRenderTree to handle error pages

  • trunk/Source/WebCore/ChangeLog

    r188935 r188947  
     12015-08-25  Nan Wang  <n_wang@apple.com>
     2
     3        AX: Enable accessibility/aria-controls.html test for mac
     4        https://bugs.webkit.org/show_bug.cgi?id=148458
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Re-enabled accessibility/aria-controls.html test for mac.
     9
     10        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     11        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
     12
    1132015-08-25  Zalan Bujtas  <zalan@apple.com>
    214

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

    r188930 r188947  
    240240#ifndef NSAccessibilityDocumentEncodingAttribute
    241241#define NSAccessibilityDocumentEncodingAttribute @"AXDocumentEncoding"
     242#endif
     243
     244#ifndef NSAccessibilityAriaControlsAttribute
     245#define NSAccessibilityAriaControlsAttribute @"AXARIAControls"
    242246#endif
    243247
    … …  
    30693073    }
    30703074   
     3075    // Aria controls element
     3076    if ([attributeName isEqualToString:NSAccessibilityAriaControlsAttribute]) {
     3077        AccessibilityObject::AccessibilityChildrenVector ariaControls;
     3078        m_object->ariaControlsElements(ariaControls);
     3079        return convertToNSArray(ariaControls);
     3080    }
     3081   
    30713082    return nil;
    30723083}

  • trunk/Tools/ChangeLog

    r188945 r188947  
     12015-08-25  Nan Wang  <n_wang@apple.com>
     2
     3        AX: Enable accessibility/aria-controls.html test for mac
     4        https://bugs.webkit.org/show_bug.cgi?id=148458
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Implemented ariaControlsElementAtIndex(unsigned index).
     9
     10        * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
     11        (AccessibilityUIElement::ariaControlsElementAtIndex):
     12        (AccessibilityUIElement::disclosedRowAtIndex):
     13        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
     14        (WTR::AccessibilityUIElement::ariaControlsElementAtIndex):
     15
    1162015-08-25  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
    217

  • trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm

    r188930 r188947  
    396396AccessibilityUIElement AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
    397397{
    398     // FIXME: implement
    399     return 0;
     398    BEGIN_AX_OBJC_EXCEPTIONS
     399    NSArray* ariaControls = [m_element accessibilityAttributeValue:@"AXARIAControls"];
     400    if (index < [ariaControls count])
     401        return [ariaControls objectAtIndex:index];
     402    END_AX_OBJC_EXCEPTIONS
     403   
     404    return nullptr;
    400405}
    401406

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

    r188930 r188947  
    459459PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
    460460{
    461     // FIXME: implement
     461    BEGIN_AX_OBJC_EXCEPTIONS
     462    NSArray* ariaControls = [m_element accessibilityAttributeValue:@"AXARIAControls"];
     463    if (index < [ariaControls count])
     464        return AccessibilityUIElement::create([ariaControls objectAtIndex:index]);
     465    END_AX_OBJC_EXCEPTIONS
    462466    return nullptr;
    463467}
Note: See TracChangeset for help on using the changeset viewer.