Changeset 182012 in webkit

Timestamp:

Mar 26, 2015 9:35:58 AM (9 years ago)

Author:

Chris Fleizach

Message:

AX: [role="button"][aria-pressed] should be exposed as AXCheckbox:AXToggleButton, with role description of "toggle button"
​https://bugs.webkit.org/show_bug.cgi?id=115298

Reviewed by Mario Sanchez Prada.

Source/WebCore:

A role=button + aria-pressed object should be exposed as AXCheckbox on Mac now. It should also convert the
aria-pressed state into a 0, 1, 2 number value for the Mac.

Test: platform/mac/accessibility/aria-pressed-button-attributes.html

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::checkboxOrRadioValue):

• accessibility/AccessibilityObject.h:

(WebCore::AccessibilityObject::isToggleButton):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
(createAccessibilityRoleMap):
(-[WebAccessibilityObjectWrapper subrole]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):

LayoutTests:

• accessibility/aria-toggle-button-with-title.html:

Bad path for post test resources file, so that is fixed.

• platform/mac/accessibility/aria-pressed-button-attributes-expected.txt: Added.
• platform/mac/accessibility/aria-pressed-button-attributes.html: Added.
• platform/mac/accessibility/aria-toggle-button-with-title-expected.txt:

Updated to reflect the new role of this object.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/aria-toggle-button-with-title.html (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes-expected.txt (added)
• LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes.html (added)
• LayoutTests/platform/mac/accessibility/aria-toggle-button-with-title-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (2 diffs)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-26  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: [role="button"][aria-pressed] should be exposed as AXCheckbox:AXToggleButton, with role description of "toggle button"
+        https://bugs.webkit.org/show_bug.cgi?id=115298
+
+        Reviewed by Mario Sanchez Prada.
+
+        * accessibility/aria-toggle-button-with-title.html:
+             Bad path for post test resources file, so that is fixed.
+        * platform/mac/accessibility/aria-pressed-button-attributes-expected.txt: Added.
+        * platform/mac/accessibility/aria-pressed-button-attributes.html: Added.
+        * platform/mac/accessibility/aria-toggle-button-with-title-expected.txt:
+              Updated to reflect the new role of this object.
+
 2015-03-26  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/accessibility/aria-toggle-button-with-title.html

@@ -39 +39 @@
 
 </script>
-<script src="../../../resources/js-test-post.js"></script>
+<script src="../resources/js-test-post.js"></script>
 </body>
 </html>

trunk/LayoutTests/platform/mac/accessibility/aria-toggle-button-with-title-expected.txt

@@ -6 +6 @@
 
 
-Role: AXRole: AXButton
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Role: AXRole: AXCheckBox
 PASS tbutton1.title is 'AXTitle: Toggle button'
 Role: AXRole: AXButton

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-26  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: [role="button"][aria-pressed] should be exposed as AXCheckbox:AXToggleButton, with role description of "toggle button"
+        https://bugs.webkit.org/show_bug.cgi?id=115298
+
+        Reviewed by Mario Sanchez Prada.
+
+        A role=button + aria-pressed object should be exposed as AXCheckbox on Mac now. It should also convert the
+        aria-pressed state into a 0, 1, 2 number value for the Mac.
+
+        Test: platform/mac/accessibility/aria-pressed-button-attributes.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::checkboxOrRadioValue):
+        * accessibility/AccessibilityObject.h:
+        (WebCore::AccessibilityObject::isToggleButton):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
+        (createAccessibilityRoleMap):
+        (-[WebAccessibilityObjectWrapper subrole]):
+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
 2015-03-25  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -2227 +2227 @@
     // If this is a real checkbox or radio button, AccessibilityRenderObject will handle.
     // If it's an ARIA checkbox, radio, or switch the aria-checked attribute should be used.
-
+    // If it's a toggle button, the aria-pressed attribute is consulted.
+
+    if (isToggleButton()) {
+        const AtomicString& ariaPressed = getAttribute(aria_pressedAttr);
+        if (equalIgnoringCase(ariaPressed, "true"))
+            return ButtonStateOn;
+        if (equalIgnoringCase(ariaPressed, "mixed"))
+            return ButtonStateMixed;
+        return ButtonStateOff;
+    }
+    
     const AtomicString& result = getAttribute(aria_checkedAttr);
     if (equalIgnoringCase(result, "true"))

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -503 +503 @@
     virtual bool isMediaControlLabel() const { return false; }
     bool isSwitch() const { return roleValue() == SwitchRole; }
+    bool isToggleButton() const { return roleValue() == ToggleButtonRole; }
     bool isTextControl() const;
     bool isARIATextControl() const;
@@ -600 +601 @@
     virtual void ariaControlsElements(AccessibilityChildrenVector&) const { }
     virtual bool ariaHasPopup() const { return false; }
-    virtual bool ariaPressedIsPresent() const;
+    bool ariaPressedIsPresent() const;
     bool ariaIsMultiline() const;
     String invalidStatus() const;

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

@@ -1191 +1191 @@
     if (m_object->supportsARIAOwns())
         [additional addObject:NSAccessibilityOwnsAttribute];
+    
+    if (m_object->isToggleButton())
+        [additional addObject:NSAccessibilityValueAttribute];
     
     if (m_object->supportsARIAExpanded())
@@ -1945 +1948 @@
         { SpinButtonRole, NSAccessibilityIncrementorRole },
         { FooterRole, NSAccessibilityGroupRole },
-        { ToggleButtonRole, NSAccessibilityButtonRole },
+        { ToggleButtonRole, NSAccessibilityCheckBoxRole },
         { CanvasRole, NSAccessibilityImageRole },
         { SVGRootRole, NSAccessibilityGroupRole },
@@ -1999 +2002 @@
     if (m_object->isAttachment()) {
         NSView* attachView = [self attachmentView];
-        if ([[attachView accessibilityAttributeNames] containsObject:NSAccessibilitySubroleAttribute]) {
+        if ([[attachView accessibilityAttributeNames] containsObject:NSAccessibilitySubroleAttribute])
             return [attachView accessibilityAttributeValue:NSAccessibilitySubroleAttribute];
-        }
-    }
-    
-    if (m_object->roleValue() == HorizontalRuleRole)
+    }
+    
+    AccessibilityRole role = m_object->roleValue();
+    if (role == HorizontalRuleRole)
         return NSAccessibilityContentSeparatorSubrole;
+    if (role == ToggleButtonRole)
+        return NSAccessibilityToggleSubrole;
     
     if (is<AccessibilitySpinButtonPart>(*m_object)) {
@@ -2030 +2035 @@
     
     // ARIA content subroles.
-    switch (m_object->roleValue()) {
+    switch (role) {
         case LandmarkApplicationRole:
             return @"AXLandmarkApplication";
@@ -2086 +2091 @@
     }
     
-    if (m_object->roleValue() == MathElementRole) {
+    if (role == MathElementRole) {
         if (m_object->isMathFraction())
             return @"AXMathFraction";
@@ -2123 +2128 @@
     }
     
-    if (m_object->roleValue() == VideoRole)
+    if (role == VideoRole)
         return @"AXVideo";
-    if (m_object->roleValue() == AudioRole)
+    if (role == AudioRole)
         return @"AXAudio";
     
@@ -2450 +2455 @@
             return [NSNumber numberWithInt:m_object->headingLevel()];
         
-        if (m_object->isCheckboxOrRadio() || m_object->isMenuItem() || m_object->isSwitch()) {
+        if (m_object->isCheckboxOrRadio() || m_object->isMenuItem() || m_object->isSwitch() || m_object->isToggleButton()) {
             switch (m_object->checkboxOrRadioValue()) {
                 case ButtonStateOff: