Changeset 166175 in webkit

Timestamp:

Mar 24, 2014 10:08:00 AM (10 years ago)

Author:

Chris Fleizach

Message:

<hr> should expose AXRole/AXSubrole, etc
​https://bugs.webkit.org/show_bug.cgi?id=109015

Reviewed by Mario Sanchez Prada.

Source/WebCore:

Expose the <hr> element to Mac and iOS through the accessibility interface.

Test: platform/mac/accessibility/hr-element.html

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

(WebCore::AccessibilityNodeObject::isEnabled):

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::computedRoleString):

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):

• accessibility/atk/AccessibilityObjectAtk.cpp:

(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
(-[WebAccessibilityObjectWrapper accessibilityLabel]):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

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

• platform/LocalizedStrings.cpp:

(WebCore::AXHorizontalRuleDescriptionText):

• platform/LocalizedStrings.h:

LayoutTests:

• accessibility/lists.html:
  • An errant <hr> element was in this test which changed results
• accessibility/roles-computedRoleString-expected.txt:
• accessibility/roles-exposed.html:
• platform/gtk/accessibility/roles-exposed-expected.txt: Added.
• platform/mac/accessibility/hr-element-expected.txt: Added.
• platform/mac/accessibility/hr-element.html: Added.
• platform/mac/accessibility/lists-expected.txt:
• platform/mac/accessibility/roles-exposed-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/lists.html (modified) (1 diff)
• LayoutTests/accessibility/roles-computedRoleString-expected.txt (modified) (1 diff)
• LayoutTests/accessibility/roles-exposed.html (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/hr-element-expected.txt (added)
• LayoutTests/platform/mac/accessibility/hr-element.html (added)
• LayoutTests/platform/mac/accessibility/lists-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (2 diffs)
• 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/AccessibilityRenderObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp (modified) (1 diff)
• Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (3 diffs)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (4 diffs)
• Source/WebCore/platform/LocalizedStrings.cpp (modified) (1 diff)
• Source/WebCore/platform/LocalizedStrings.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-24  Chris Fleizach  <cfleizach@apple.com>
+
+        <hr> should expose AXRole/AXSubrole, etc
+        https://bugs.webkit.org/show_bug.cgi?id=109015
+
+        Reviewed by Mario Sanchez Prada.
+
+        * accessibility/lists.html:
+            - An errant <hr> element was in this test which changed results
+        * accessibility/roles-computedRoleString-expected.txt:
+        * accessibility/roles-exposed.html:
+        * platform/gtk/accessibility/roles-exposed-expected.txt: Added.
+        * platform/mac/accessibility/hr-element-expected.txt: Added.
+        * platform/mac/accessibility/hr-element.html: Added.
+        * platform/mac/accessibility/lists-expected.txt:
+        * platform/mac/accessibility/roles-exposed-expected.txt:
+
 2014-03-24  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/accessibility/lists.html

@@ -26 +26 @@
     </dl>
 
-    <BR><BR><BR><hr><BR>
+    <BR><BR><BR><BR>
     <div id="result"></div>    
 

trunk/LayoutTests/accessibility/roles-computedRoleString-expected.txt

@@ -20 +20 @@
 PASS: h5 -> heading. 
 PASS: h5 -> heading. 
+PASS: hr -> separator. 
 PASS: img[alt='X'] -> img. 
 PASS: input[type='button'] -> button. 

trunk/LayoutTests/accessibility/roles-exposed.html

@@ -51 +51 @@
 <h5 data-platform="atk,mac" data-role="AXHeading" data-subrole="" data-roledescription="heading" class="ex">X</h5>
 <h6 data-platform="atk,mac" data-role="AXHeading" data-subrole="" data-roledescription="heading" class="ex">X</h6>
-<!-- http://webkit.org/b/109015 --><hr data-platform="atk,mac" data-role="" data-role-atk="AXSeparator" data-subrole="" data-roledescription="" class="ex">
+<hr data-platform="atk,mac" data-role-mac="AXSplitter" data-role-atk="AXSeparator" data-subrole="AXContentSeparator" data-roledescription="separator" class="ex">
 <!-- skipped <html> -->
 <!-- [ATK] Skipped: not focusable --><i data-platform="mac" data-role="" data-subrole="" data-roledescription="" class="ex">X</i>

trunk/LayoutTests/platform/mac/accessibility/lists-expected.txt

@@ -111 +111 @@
 AXHelp: 
 AXParent: <AXGroup>
-AXSize: NSSize: {784, 54}
-AXTitle: 
-AXDescription: 
-AXValue: 
-AXFocused: 0
-AXEnabled: 1
-AXWindow: <AXGroup>
-AXSelectedTextMarkerRange: (null)
-AXStartTextMarker: <AXGroup>
-AXEndTextMarker: <AXGroup>
-AXVisited: 0
-AXLinkedUIElements: (null)
-AXSelected: 0
-AXBlockQuoteLevel: 0
-AXTopLevelUIElement: <AXGroup>
-AXLanguage: 
-AXDOMIdentifier: 
-AXDOMClassList: <array of size 0>
-AXTitleUIElement: (null)
-AXElementBusy: 0
-
-------------
-AXRole: AXGroup
-AXSubrole: (null)
-AXRoleDescription: group
-AXChildren: <array of size 0>
-AXHelp: 
-AXParent: <AXGroup>
-AXSize: NSSize: {784, 18}
+AXSize: NSSize: {784, 72}
 AXTitle: 
 AXDescription: 

trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt

@@ -171 +171 @@
       
 PASS: hr
-      AXRole: 
-      AXSubrole: 
-      AXRoleDescription: 
+      AXRole: AXSplitter
+      AXSubrole: AXContentSeparator
+      AXRoleDescription: separator
       
 PASS: i

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-24  Chris Fleizach  <cfleizach@apple.com>
+
+        <hr> should expose AXRole/AXSubrole, etc
+        https://bugs.webkit.org/show_bug.cgi?id=109015
+
+        Reviewed by Mario Sanchez Prada.
+
+        Expose the <hr> element to Mac and iOS through the accessibility interface.
+
+        Test: platform/mac/accessibility/hr-element.html
+
+        * English.lproj/Localizable.strings:
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::isEnabled):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::computedRoleString):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+        * accessibility/atk/AccessibilityObjectAtk.cpp:
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
+        (-[WebAccessibilityObjectWrapper accessibilityLabel]):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (createAccessibilityRoleMap):
+        (-[WebAccessibilityObjectWrapper subrole]):
+        (-[WebAccessibilityObjectWrapper roleDescription]):
+        * platform/LocalizedStrings.cpp:
+        (WebCore::AXHorizontalRuleDescriptionText):
+        * platform/LocalizedStrings.h:
+
 2014-03-24  Antti Koivisto  <antti@apple.com>
 
@@ -3063 +3094 @@
         * platform/ios/WebSafeGCActivityCallbackIOS.h:
 
-=======
 2014-03-19  Antti Koivisto  <antti@apple.com>
 

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

@@ -932 +932 @@
 "select" = "select";
 
+/* accessibility role description for a horizontal rule [<hr>] */
+"separator" = "separator";
+
 /* HTTP result code string */
 "server error" = "server error";

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -641 +641 @@
             break;
     }
-
+    
+    if (roleValue() == HorizontalRuleRole)
+        return false;
+    
     Node* node = this->node();
     if (!node || !node->isElementNode())

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -1750 +1750 @@
 {
     // FIXME: Need a few special cases that aren't in the RoleMap: option, etc. http://webkit.org/b/128296
-    return reverseAriaRoleMap().get(roleValue());
+    AccessibilityRole role = roleValue();
+    if (role == HorizontalRuleRole)
+        role = SplitterRole;
+    
+    return reverseAriaRoleMap().get(role);
 }
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1253 +1253 @@
     if (ariaRoleAttribute() != UnknownRole)
         return false;
-
+    
+    if (roleValue() == HorizontalRuleRole)
+        return false;
+    
     // don't ignore labels, because they serve as TitleUIElements
     Node* node = m_renderer->node();

trunk/Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp

@@ -43 +43 @@
 
     AccessibilityRole role = roleValue();
-    if (role == HorizontalRuleRole)
-        return IncludeObject;
-
     // We expose the slider as a whole but not its value indicator.
     if (role == SliderThumbRole)

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

@@ -45 +45 @@
 #import "IntRect.h"
 #import "IntSize.h"
+#import "LocalizedStrings.h"
 #import "Page.h"
 #import "Range.h"
@@ -621 +622 @@
         case TabRole:
         case DocumentMathRole:
+        case HorizontalRuleRole:
             return true;
         case StaticTextRole:
@@ -751 +753 @@
     NSString *axDescription = [self accessibilityDescription];
     NSString *landmarkDescription = [self ariaLandmarkRoleDescription];
-
+    
     NSMutableString *result = [NSMutableString string];
-
+    if (m_object->roleValue() == HorizontalRuleRole)
+        appendStringToResult(result, AXHorizontalRuleDescriptionText());
+        
     appendStringToResult(result, axTitle);
     appendStringToResult(result, axDescription);

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

@@ -115 +115 @@
 #ifndef NSAccessibilityDescriptionListSubrole
 #define NSAccessibilityDescriptionListSubrole @"AXDescriptionList"
+#endif
+
+#ifndef NSAccessibilityContentSeparatorSubrole
+#define NSAccessibilityContentSeparatorSubrole @"AXContentSeparator"
 #endif
 
@@ -1917 +1921 @@
         { MathElementRole, NSAccessibilityGroupRole },
         { AudioRole, NSAccessibilityGroupRole },
-        { VideoRole, NSAccessibilityGroupRole }
+        { VideoRole, NSAccessibilityGroupRole },
+        { HorizontalRuleRole, NSAccessibilitySplitterRole }
     };
     AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
@@ -1962 +1967 @@
         }
     }
+    
+    if (m_object->roleValue() == HorizontalRuleRole)
+        return NSAccessibilityContentSeparatorSubrole;
     
     if (m_object->isSpinButtonPart()) {
@@ -2156 +2164 @@
     }
     
+    if (m_object->roleValue() == HorizontalRuleRole)
+        return AXHorizontalRuleDescriptionText();
+    
     // AppKit also returns AXTab for the role description for a tab item.
     if (m_object->isTabItem())

trunk/Source/WebCore/platform/LocalizedStrings.cpp

@@ -701 +701 @@
     return String();
 }
+
+String AXHorizontalRuleDescriptionText()
+{
+    return WEB_UI_STRING("separator", "accessibility role description for a horizontal rule [<hr>]");
+}
+    
 #endif // PLATFORM(COCOA)
 

trunk/Source/WebCore/platform/LocalizedStrings.h

@@ -182 +182 @@
 #if PLATFORM(COCOA)
     String AXARIAContentGroupText(const String& ariaType);
+    String AXHorizontalRuleDescriptionText();
 #endif