Title: [188759] trunk
- Revision
- 188759
- Author
- [email protected]
- Date
- 2015-08-21 11:26:23 -0700 (Fri, 21 Aug 2015)
Log Message
[Mac] accessibility/selection-states.html fails
https://bugs.webkit.org/show_bug.cgi?id=116637
Patch by Nan Wang <[email protected]> on 2015-08-21
Reviewed by Chris Fleizach.
Source/WebCore:
Added accessibilityAttributeValue callback for isMultiSelectable attribute.
Updated expectation for accessibility/selection-states.html on mac.
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
Tools:
Implemented isSelectable() and isMultiSelectable().
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::isSelectable):
(AccessibilityUIElement::isMultiSelectable):
(AccessibilityUIElement::isSelectedOptionActive):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::isSelectable):
(WTR::AccessibilityUIElement::isMultiSelectable):
(WTR::AccessibilityUIElement::isVisible):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (188758 => 188759)
--- trunk/LayoutTests/ChangeLog 2015-08-21 18:10:17 UTC (rev 188758)
+++ trunk/LayoutTests/ChangeLog 2015-08-21 18:26:23 UTC (rev 188759)
@@ -1,3 +1,12 @@
+2015-08-21 Nan Wang <[email protected]>
+
+ [Mac] accessibility/selection-states.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=116637
+
+ Reviewed by Chris Fleizach.
+
+ * platform/mac/TestExpectations:
+
2015-08-20 Brian Burg <[email protected]>
Web Inspector: add a regression test for the fix introduced in r188679
Modified: trunk/LayoutTests/platform/mac/TestExpectations (188758 => 188759)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-08-21 18:10:17 UTC (rev 188758)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-08-21 18:26:23 UTC (rev 188759)
@@ -37,9 +37,6 @@
webkit.org/b/116636 accessibility/document-attributes.html [ Failure ]
-# Accessibility tests with missing AccessibilityController functionality.
-webkit.org/b/116637 accessibility/selection-states.html [ Failure ]
-
# Accessibility tests for notifications that don't exist or aren't needed on Mac OS X.
accessibility/aria-checkbox-sends-notification.html
accessibility/aria-switch-sends-notification.html
Modified: trunk/Source/WebCore/ChangeLog (188758 => 188759)
--- trunk/Source/WebCore/ChangeLog 2015-08-21 18:10:17 UTC (rev 188758)
+++ trunk/Source/WebCore/ChangeLog 2015-08-21 18:26:23 UTC (rev 188759)
@@ -1,3 +1,17 @@
+2015-08-21 Nan Wang <[email protected]>
+
+ [Mac] accessibility/selection-states.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=116637
+
+ Reviewed by Chris Fleizach.
+
+ Added accessibilityAttributeValue callback for isMultiSelectable attribute.
+
+ Updated expectation for accessibility/selection-states.html on mac.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
2015-08-21 Jonathan Davis <[email protected]>
Fixed status features JSON formatting.
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (188758 => 188759)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-21 18:10:17 UTC (rev 188758)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-21 18:26:23 UTC (rev 188759)
@@ -229,6 +229,10 @@
#define NSAccessibilityExpandedTextValueAttribute @"AXExpandedTextValue"
#endif
+#ifndef NSAccessibilityIsMultiSelectableAttribute
+#define NSAccessibilityIsMultiSelectableAttribute @"AXIsMultiSelectable"
+#endif
+
#define NSAccessibilityDOMIdentifierAttribute @"AXDOMIdentifier"
#define NSAccessibilityDOMClassListAttribute @"AXDOMClassList"
@@ -3039,6 +3043,10 @@
if (m_object->isWebArea() && [attributeName isEqualToString:NSAccessibilityCaretBrowsingEnabledAttribute])
return [NSNumber numberWithBool:m_object->caretBrowsingEnabled()];
+ // Multi-selectable
+ if ([attributeName isEqualToString:NSAccessibilityIsMultiSelectableAttribute])
+ return [NSNumber numberWithBool:m_object->isMultiSelectable()];
+
return nil;
}
Modified: trunk/Tools/ChangeLog (188758 => 188759)
--- trunk/Tools/ChangeLog 2015-08-21 18:10:17 UTC (rev 188758)
+++ trunk/Tools/ChangeLog 2015-08-21 18:26:23 UTC (rev 188759)
@@ -1,3 +1,21 @@
+2015-08-21 Nan Wang <[email protected]>
+
+ [Mac] accessibility/selection-states.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=116637
+
+ Reviewed by Chris Fleizach.
+
+ Implemented isSelectable() and isMultiSelectable().
+
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::isSelectable):
+ (AccessibilityUIElement::isMultiSelectable):
+ (AccessibilityUIElement::isSelectedOptionActive):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::isSelectable):
+ (WTR::AccessibilityUIElement::isMultiSelectable):
+ (WTR::AccessibilityUIElement::isVisible):
+
2015-08-21 Jason Marcell <[email protected]>
Fix iteration over repositories on bot watcher's dashboard.
Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (188758 => 188759)
--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-21 18:10:17 UTC (rev 188758)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-21 18:26:23 UTC (rev 188759)
@@ -1463,14 +1463,22 @@
bool AccessibilityUIElement::isSelectable() const
{
- // FIXME: implement
- return false;
+ bool result = false;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ result = [m_element accessibilityIsAttributeSettable:NSAccessibilitySelectedAttribute];
+ END_AX_OBJC_EXCEPTIONS
+ return result;
}
bool AccessibilityUIElement::isMultiSelectable() const
{
- // FIXME: implement
- return false;
+ BOOL result = NO;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:@"AXIsMultiSelectable"];
+ if ([value isKindOfClass:[NSNumber class]])
+ result = [value boolValue];
+ END_AX_OBJC_EXCEPTIONS
+ return result;
}
bool AccessibilityUIElement::isSelectedOptionActive() const
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (188758 => 188759)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-21 18:10:17 UTC (rev 188758)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-21 18:26:23 UTC (rev 188759)
@@ -1504,14 +1504,22 @@
bool AccessibilityUIElement::isSelectable() const
{
- // FIXME: implement
- return false;
+ bool result = false;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ result = [m_element accessibilityIsAttributeSettable:NSAccessibilitySelectedAttribute];
+ END_AX_OBJC_EXCEPTIONS
+ return result;
}
bool AccessibilityUIElement::isMultiSelectable() const
{
- // FIXME: implement
- return false;
+ BOOL result = NO;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:@"AXIsMultiSelectable"];
+ if ([value isKindOfClass:[NSNumber class]])
+ result = [value boolValue];
+ END_AX_OBJC_EXCEPTIONS
+ return result;
}
bool AccessibilityUIElement::isVisible() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
