Diff
Modified: trunk/LayoutTests/ChangeLog (188946 => 188947)
--- trunk/LayoutTests/ChangeLog 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
@@ -1,3 +1,14 @@
+2015-08-25 Nan Wang <n_w...@apple.com>
+
+ AX: Enable accessibility/aria-controls.html test for mac
+ https://bugs.webkit.org/show_bug.cgi?id=148458
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/aria-controls.html:
+ * platform/mac/TestExpectations:
+ * platform/mac/accessibility/aria-controls-expected.txt: Added.
+
2015-08-25 Myles C. Maxfield <mmaxfi...@apple.com>
More test gardening of css3/line-break-language-sensitive.
Modified: trunk/LayoutTests/accessibility/aria-controls.html (188946 => 188947)
--- trunk/LayoutTests/accessibility/aria-controls.html 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/accessibility/aria-controls.html 2015-08-26 06:49:45 UTC (rev 188947)
@@ -22,8 +22,13 @@
var tablist = accessibilityController.accessibleElementById("tablist");
var tab1 = tablist.childAtIndex(0);
- shouldBe("tab1.ariaControlsElementAtIndex(0).stringValue", "'AXValue: Panel 1'");
- shouldBe("tab1.ariaControlsElementAtIndex(1).stringValue", "'AXValue: Panel 2'");
+ if (accessibilityController.platformName == "mac") {
+ shouldBe("tab1.ariaControlsElementAtIndex(0).childAtIndex(0).stringValue", "'AXValue: Panel 1'");
+ shouldBe("tab1.ariaControlsElementAtIndex(1).childAtIndex(0).stringValue", "'AXValue: Panel 2'");
+ } else {
+ shouldBe("tab1.ariaControlsElementAtIndex(0).stringValue", "'AXValue: Panel 1'");
+ shouldBe("tab1.ariaControlsElementAtIndex(1).stringValue", "'AXValue: Panel 2'");
+ }
}
</script>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (188946 => 188947)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-08-26 06:49:45 UTC (rev 188947)
@@ -47,9 +47,6 @@
# Missing implementation of some functions in mac.
webkit.org/b/129039 accessibility/select-element-at-index.html [ Skip ]
-# ariaControlsElementAtIndex is not implemented in mac
-webkit.org/b/127908 accessibility/aria-controls.html [ Skip ]
-
# Need to add functionality to DumpRenderTree to handle error pages
fast/history/back-forward-reset-after-error-handling.html
Added: trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt (0 => 188947)
--- trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-controls-expected.txt 2015-08-26 06:49:45 UTC (rev 188947)
@@ -0,0 +1,13 @@
+Panel 1
+Panel 2
+This tests that aria-controls returns correct element at the given index
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS tab1.ariaControlsElementAtIndex(0).childAtIndex(0).stringValue is 'AXValue: Panel 1'
+PASS tab1.ariaControlsElementAtIndex(1).childAtIndex(0).stringValue is 'AXValue: Panel 2'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/Source/WebCore/ChangeLog (188946 => 188947)
--- trunk/Source/WebCore/ChangeLog 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Source/WebCore/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
@@ -1,3 +1,15 @@
+2015-08-25 Nan Wang <n_w...@apple.com>
+
+ AX: Enable accessibility/aria-controls.html test for mac
+ https://bugs.webkit.org/show_bug.cgi?id=148458
+
+ Reviewed by Chris Fleizach.
+
+ Re-enabled accessibility/aria-controls.html test for mac.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
2015-08-25 Zalan Bujtas <za...@apple.com>
Using the filter functional notation for background images results in wrong background-size rendering
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (188946 => 188947)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-26 06:49:45 UTC (rev 188947)
@@ -241,6 +241,10 @@
#define NSAccessibilityDocumentEncodingAttribute @"AXDocumentEncoding"
#endif
+#ifndef NSAccessibilityAriaControlsAttribute
+#define NSAccessibilityAriaControlsAttribute @"AXARIAControls"
+#endif
+
#define NSAccessibilityDOMIdentifierAttribute @"AXDOMIdentifier"
#define NSAccessibilityDOMClassListAttribute @"AXDOMClassList"
@@ -3068,6 +3072,13 @@
return nil;
}
+ // Aria controls element
+ if ([attributeName isEqualToString:NSAccessibilityAriaControlsAttribute]) {
+ AccessibilityObject::AccessibilityChildrenVector ariaControls;
+ m_object->ariaControlsElements(ariaControls);
+ return convertToNSArray(ariaControls);
+ }
+
return nil;
}
Modified: trunk/Tools/ChangeLog (188946 => 188947)
--- trunk/Tools/ChangeLog 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Tools/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
@@ -1,3 +1,18 @@
+2015-08-25 Nan Wang <n_w...@apple.com>
+
+ AX: Enable accessibility/aria-controls.html test for mac
+ https://bugs.webkit.org/show_bug.cgi?id=148458
+
+ Reviewed by Chris Fleizach.
+
+ Implemented ariaControlsElementAtIndex(unsigned index).
+
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::ariaControlsElementAtIndex):
+ (AccessibilityUIElement::disclosedRowAtIndex):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::ariaControlsElementAtIndex):
+
2015-08-25 Gyuyoung Kim <gyuyoung....@webkit.org>
Remove python tests for PassRefPtr
Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (188946 => 188947)
--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-26 06:49:45 UTC (rev 188947)
@@ -395,8 +395,13 @@
AccessibilityUIElement AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
{
- // FIXME: implement
- return 0;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ NSArray* ariaControls = [m_element accessibilityAttributeValue:@"AXARIAControls"];
+ if (index < [ariaControls count])
+ return [ariaControls objectAtIndex:index];
+ END_AX_OBJC_EXCEPTIONS
+
+ return nullptr;
}
AccessibilityUIElement AccessibilityUIElement::disclosedRowAtIndex(unsigned index)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (188946 => 188947)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-26 06:29:48 UTC (rev 188946)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-26 06:49:45 UTC (rev 188947)
@@ -458,7 +458,11 @@
PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
{
- // FIXME: implement
+ BEGIN_AX_OBJC_EXCEPTIONS
+ NSArray* ariaControls = [m_element accessibilityAttributeValue:@"AXARIAControls"];
+ if (index < [ariaControls count])
+ return AccessibilityUIElement::create([ariaControls objectAtIndex:index]);
+ END_AX_OBJC_EXCEPTIONS
return nullptr;
}
