Changeset 207429 in webkit

Timestamp:

Oct 17, 2016 2:00:47 PM (8 years ago)

Author:

n_wang@apple.com

Message:

AX: [Mac] mapping for output elements
​https://bugs.webkit.org/show_bug.cgi?id=163471

Reviewed by Chris Fleizach.

Source/WebCore:

Mapped the output element to status role and exposed its text content
as AXTitle.

Test: accessibility/mac/output-element.html

• English.lproj/Localizable.strings:
• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::visibleText):

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::isOutput):

• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::determineAccessibilityRole):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper roleDescription]):

• platform/LocalizedStrings.cpp:

(WebCore::AXOutputText):

• platform/LocalizedStrings.h:
• platform/efl/LocalizedStringsEfl.cpp:

(WebCore::AXOutputText):

• platform/gtk/LocalizedStringsGtk.cpp:

(WebCore::AXOutputText):

LayoutTests:

• accessibility/mac/output-element-expected.txt: Added.
• accessibility/mac/output-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/output-element-expected.txt (added)
• LayoutTests/accessibility/mac/output-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/English.lproj/Localizable.strings (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityNodeObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (1 diff)
• Source/WebCore/platform/LocalizedStrings.cpp (modified) (1 diff)
• Source/WebCore/platform/LocalizedStrings.h (modified) (1 diff)
• Source/WebCore/platform/efl/LocalizedStringsEfl.cpp (modified) (1 diff)
• Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-17  Nan Wang  <n_wang@apple.com>
+
+        AX: [Mac] mapping for output elements
+        https://bugs.webkit.org/show_bug.cgi?id=163471
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/mac/output-element-expected.txt: Added.
+        * accessibility/mac/output-element.html: Added.
+
 2016-10-17  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-17  Nan Wang  <n_wang@apple.com>
+
+        AX: [Mac] mapping for output elements
+        https://bugs.webkit.org/show_bug.cgi?id=163471
+
+        Reviewed by Chris Fleizach.
+
+        Mapped the output element to status role and exposed its text content
+        as AXTitle. 
+
+        Test: accessibility/mac/output-element.html
+
+        * English.lproj/Localizable.strings:
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::visibleText):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::isOutput):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper roleDescription]):
+        * platform/LocalizedStrings.cpp:
+        (WebCore::AXOutputText):
+        * platform/LocalizedStrings.h:
+        * platform/efl/LocalizedStringsEfl.cpp:
+        (WebCore::AXOutputText):
+        * platform/gtk/LocalizedStringsGtk.cpp:
+        (WebCore::AXOutputText):
+
 2016-10-17  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/English.lproj/Localizable.strings

@@ -971 +971 @@
 "number of seconds of movie remaining" = "number of seconds of movie remaining";
 
+/* accessibility role description for an output element */
+"output" = "output";
+
 /* HTTP result code string */
 "partial content" = "partial content";

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -1408 +1408 @@
         useTextUnderElement = true;
     
+    if (isOutput())
+        useTextUnderElement = true;
+    
     if (useTextUnderElement) {
         AccessibilityTextUnderElementMode mode;

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -3106 +3106 @@
     return node && node->hasTagName(figureTag);
 }
+
+bool AccessibilityObject::isOutput() const
+{
+    Node* node = this->node();
+    return node && node->hasTagName(outputTag);
+}
     
 bool AccessibilityObject::isContainedByPasswordField() const

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -563 +563 @@
     bool isFigure() const;
     bool isSummary() const { return roleValue() == SummaryRole; }
+    bool isOutput() const;
     
     virtual bool isChecked() const { return false; }

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -2750 +2750 @@
     if (is<HTMLSummaryElement>(node))
         return SummaryRole;
+    
+    // http://rawgit.com/w3c/aria/master/html-aam/html-aam.html
+    // Output elements should be mapped to status role.
+    if (isOutput())
+        return ApplicationStatusRole;
 
 #if ENABLE(VIDEO)

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

@@ -2475 +2475 @@
     if ([axRole isEqualToString:NSAccessibilityGroupRole]) {
         
+        if (m_object->isOutput())
+            return AXOutputText();
+        
         NSString *ariaLandmarkRoleDescription = [self ariaLandmarkRoleDescription];
         if (ariaLandmarkRoleDescription)

trunk/Source/WebCore/platform/LocalizedStrings.cpp

@@ -624 +624 @@
 {
     return WEB_UI_STRING("file upload button", "accessibility role description for a file upload button");
+}
+
+String AXOutputText()
+{
+    return WEB_UI_STRING("output", "accessibility role description for an output element");
 }
 

trunk/Source/WebCore/platform/LocalizedStrings.h

@@ -167 +167 @@
     String AXFooterRoleDescriptionText();
     String AXFileUploadButtonText();
+    String AXOutputText();
     String AXSearchFieldCancelButtonText();
     String AXAttachmentRoleText();

trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp

@@ -412 +412 @@
 {
     return String::fromUTF8("figure");
+}
+
+String AXOutputText()
+{
+    return String::fromUTF8("output");
 }
 

trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp

@@ -460 +460 @@
 {
     return String::fromUTF8(_("figure"));
+}
+
+String AXOutputText()
+{
+    return String::fromUTF8(_("output"));
 }