Changeset 185558 in webkit

Timestamp:

Jun 15, 2015 11:39:20 AM (9 years ago)

Author:

Chris Fleizach

Message:

AX: no accessibility support for details element
​https://bugs.webkit.org/show_bug.cgi?id=131111

Reviewed by Darin Adler.

Source/WebCore:

Add accessibility support for Mac for details element by:

1) Returning new subroles for <details> and <summary>
2) Exposing isExpanded property for <details> element.

Test: platform/mac/accessibility/details-summary.html

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::supportsARIAPressed):
(WebCore::AccessibilityObject::supportsExpanded):
(WebCore::AccessibilityObject::isExpanded):
(WebCore::AccessibilityObject::supportsARIAExpanded): Deleted.

• accessibility/AccessibilityObject.h:

(WebCore::AccessibilityObject::canvasHasFallbackContent):

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper accessibilitySupportsARIAExpanded]):
(-[WebAccessibilityObjectWrapper accessibilityIsExpanded]):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

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

• html/HTMLDetailsElement.h:
• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):

LayoutTests:

• platform/mac/accessibility/details-summary-expected.txt: Added.
• platform/mac/accessibility/details-summary.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/details-summary-expected.txt (added)
• LayoutTests/platform/mac/accessibility/details-summary.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (4 diffs)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (1 diff)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (3 diffs)
• Source/WebCore/html/HTMLDetailsElement.h (modified) (1 diff)
• Source/WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-15  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: no accessibility support for details element
+        https://bugs.webkit.org/show_bug.cgi?id=131111
+
+        Reviewed by Darin Adler.
+
+        * platform/mac/accessibility/details-summary-expected.txt: Added.
+        * platform/mac/accessibility/details-summary.html: Added.
+
 2015-06-13  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-15  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: no accessibility support for details element
+        https://bugs.webkit.org/show_bug.cgi?id=131111
+
+        Reviewed by Darin Adler.
+
+        Add accessibility support for Mac for details element by:
+           1) Returning new subroles for <details> and <summary>
+           2) Exposing isExpanded property for <details> element.
+
+        Test: platform/mac/accessibility/details-summary.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::supportsARIAPressed):
+        (WebCore::AccessibilityObject::supportsExpanded):
+        (WebCore::AccessibilityObject::isExpanded):
+        (WebCore::AccessibilityObject::supportsARIAExpanded): Deleted.
+        * accessibility/AccessibilityObject.h:
+        (WebCore::AccessibilityObject::canvasHasFallbackContent):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilitySupportsARIAExpanded]):
+        (-[WebAccessibilityObjectWrapper accessibilityIsExpanded]):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
+        (createAccessibilityRoleMap):
+        (-[WebAccessibilityObjectWrapper subrole]):
+        * html/HTMLDetailsElement.h:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+
 2015-06-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -42 +42 @@
 #include "FrameLoader.h"
 #include "FrameSelection.h"
+#include "HTMLDetailsElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
@@ -2220 +2221 @@
 }
     
-bool AccessibilityObject::supportsARIAExpanded() const
+bool AccessibilityObject::supportsExpanded() const
 {
     // Undefined values should not result in this attribute being exposed to ATs according to ARIA.
@@ -2229 +2230 @@
     case ComboBoxRole:
     case DisclosureTriangleRole:
+    case DetailsRole:
         return true;
     default:
@@ -2239 +2241 @@
     if (equalIgnoringCase(getAttribute(aria_expandedAttr), "true"))
         return true;
+    
+    if (is<HTMLDetailsElement>(node()))
+        return downcast<HTMLDetailsElement>(node())->isOpen();
     
     return false;  

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -119 +119 @@
     DescriptionListTermRole,
     DescriptionListDetailRole,
+    DetailsRole,
     DirectoryRole,
     DisclosureTriangleRole,
@@ -196 +197 @@
     SplitterRole,
     StaticTextRole,
+    SummaryRole,
     SwitchRole,
     SystemWideRole,
@@ -613 +615 @@
     String invalidStatus() const;
     bool supportsARIAPressed() const;
-    bool supportsARIAExpanded() const;
+    bool supportsExpanded() const;
     bool supportsChecked() const;
     AccessibilitySortDirection sortDirection() const;

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1257 +1257 @@
     case DescriptionListTermRole:
     case DescriptionListDetailRole:
+    case DetailsRole:
     case DocumentArticleRole:
     case DocumentRegionRole:
@@ -2652 +2653 @@
         return PreRole;
 
+    if (is<HTMLDetailsElement>(node))
+        return DetailsRole;
+    if (is<HTMLSummaryElement>(node))
+        return SummaryRole;
+
 #if ENABLE(VIDEO)
     if (is<HTMLVideoElement>(node))

trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

@@ -2327 +2327 @@
         return NO;
     
-    return m_object->supportsARIAExpanded();
+    return m_object->supportsExpanded();
 }
 

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

@@ -1215 +1215 @@
         [additional addObject:NSAccessibilityValueAttribute];
     
-    if (m_object->supportsARIAExpanded())
+    if (m_object->supportsExpanded())
         [additional addObject:NSAccessibilityExpandedAttribute];
     
@@ -1986 +1986 @@
         { RubyRunRole, NSAccessibilityGroupRole },
         { RubyTextRole, NSAccessibilityGroupRole },
+        { DetailsRole, NSAccessibilityGroupRole },
+        { SummaryRole, NSAccessibilityGroupRole },
     };
     AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
@@ -2162 +2164 @@
     if (role == AudioRole)
         return @"AXAudio";
+    if (role == DetailsRole)
+        return @"AXDetails";
+    if (role == SummaryRole)
+        return @"AXSummary";
     
     if (m_object->isMediaTimeline())

trunk/Source/WebCore/html/HTMLDetailsElement.h

@@ -32 +32 @@
 
     const Element* findMainSummary() const;
-
+    bool isOpen() const { return m_isOpen; }
+    
 private:
     HTMLDetailsElement(const QualifiedName&, Document&);

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1511 +1511 @@
             exists = true;
             
-            supportsExpanded = axObject->supportsARIAExpanded();
+            supportsExpanded = axObject->supportsExpanded();
             if (supportsExpanded)
                 expanded = axObject->isExpanded();