2009-11-20 Chris Fleizach <cfleizach@apple.com>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Nov 2009 00:00:21 +0000 (00:00 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Nov 2009 00:00:21 +0000 (00:00 +0000)
        Reviewed by Beth Dakin.

        WAI-ARIA: add support for 'math' role
        https://bugs.webkit.org/show_bug.cgi?id=31706

        * platform/mac/accessibility/aria-grouping-roles-expected.txt:
        * platform/mac/accessibility/aria-grouping-roles.html:
2009-11-20  Chris Fleizach  <cfleizach@apple.com>

        Reviewed by Beth Dakin.

        WAI-ARIA: add support for 'math' role
        https://bugs.webkit.org/show_bug.cgi?id=31706

        * accessibility/AccessibilityObject.cpp:
        * accessibility/AccessibilityObject.h:
        * accessibility/mac/AccessibilityObjectWrapper.mm:
2009-11-20  Chris Fleizach  <cfleizach@apple.com>

        Reviewed by Beth Dakin.

        WAI-ARIA: add support for 'math' role
        https://bugs.webkit.org/show_bug.cgi?id=31706

        * English.lproj/Localizable.strings:
        * StringsNotToBeLocalized.txt:
2009-11-20  Chris Fleizach  <cfleizach@apple.com>

        Reviewed by Beth Dakin.

        WAI-ARIA: add support for 'math' role
        https://bugs.webkit.org/show_bug.cgi?id=31706

        * WebCoreSupport/WebViewFactory.mm:
        (-[WebViewFactory AXARIAContentGroupText:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/mac/accessibility/aria-grouping-roles-expected.txt
LayoutTests/platform/mac/accessibility/aria-grouping-roles.html
WebCore/ChangeLog
WebCore/accessibility/AccessibilityObject.cpp
WebCore/accessibility/AccessibilityObject.h
WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
WebKit/ChangeLog
WebKit/English.lproj/Localizable.strings
WebKit/StringsNotToBeLocalized.txt
WebKit/mac/ChangeLog
WebKit/mac/WebCoreSupport/WebViewFactory.mm

index 2cd83e3..6e3972f 100644 (file)
@@ -1,3 +1,13 @@
+2009-11-20  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        WAI-ARIA: add support for 'math' role
+        https://bugs.webkit.org/show_bug.cgi?id=31706
+
+        * platform/mac/accessibility/aria-grouping-roles-expected.txt:
+        * platform/mac/accessibility/aria-grouping-roles.html:
+
 2009-11-20  Yael Aharon  <yael.aharon@nokia.com>
 
         Unreviewed fix.
index 4afe903..20c50d3 100644 (file)
@@ -13,6 +13,7 @@ region role
 search role
 status role
 tooltip role
+math role
 definition role
 This tests that each of these ARIA grouping type roles map to the right role and subrole.
 
@@ -50,6 +51,8 @@ PASS obj.childAtIndex(k).subrole is "AXSubrole: AXApplicationStatus"
 PASS obj.childAtIndex(k).role is 'AXRole: AXGroup'
 PASS obj.childAtIndex(k).subrole is "AXSubrole: AXUserInterfaceTooltip"
 PASS obj.childAtIndex(k).role is 'AXRole: AXGroup'
+PASS obj.childAtIndex(k).subrole is "AXSubrole: AXDocumentMath"
+PASS obj.childAtIndex(k).role is 'AXRole: AXGroup'
 PASS obj.childAtIndex(k).description is 'AXDescription: definition'
 PASS successfullyParsed is true
 
index ae3c7b5..d3a2b5b 100644 (file)
@@ -24,6 +24,7 @@ var successfullyParsed = false;
 <div role="search">search role</div>
 <div role="status">status role</div>
 <div role="tooltip">tooltip role</div>
+<div role="math">math role</div>
 <div role="definition">definition role</div>
 
 <p id="description"></p>
@@ -42,7 +43,7 @@ var successfullyParsed = false;
           var subroles = new Array("AXLandmarkApplication","AXDocumentArticle","AXLandmarkBanner","AXLandmarkComplementary",
                           "AXLandmarkContentInfo", "AXDocument", "AXApplicationLog", "AXLandmarkMain", "AXApplicationMarquee",
                           "AXDocumentNote", "AXLandmarkNavigation", "AXDocumentRegion", "AXLandmarkSearch", "AXApplicationStatus", 
-                          "AXUserInterfaceTooltip");
+                          "AXUserInterfaceTooltip", "AXDocumentMath");
 
           for (var k = 0; k < subroles.length; k++) {
               shouldBe("obj.childAtIndex(k).role", "'AXRole: AXGroup'");
index f9d88ea..aa4b71d 100644 (file)
@@ -1,3 +1,14 @@
+2009-11-20  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        WAI-ARIA: add support for 'math' role
+        https://bugs.webkit.org/show_bug.cgi?id=31706
+
+        * accessibility/AccessibilityObject.cpp:
+        * accessibility/AccessibilityObject.h:
+        * accessibility/mac/AccessibilityObjectWrapper.mm:
+
 2009-11-20  Yael Aharon  <yael.aharon@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
index 93c1609..a4f3400 100644 (file)
@@ -881,6 +881,7 @@ static ARIARoleMap* createARIARoleMap()
         // "option" isn't here because it may map to different roles depending on the parent element's role
         { "main", LandmarkMainRole },
         { "marquee", ApplicationMarqueeRole },
+        { "math", DocumentMathRole },
         { "menu", MenuRole },
         { "menubar", GroupRole },
         // "menuitem" isn't here because it may map to different roles depending on the parent element's role
index a978a79..f8cd999 100644 (file)
@@ -187,6 +187,7 @@ enum AccessibilityRole {
     
     DocumentRole,
     DocumentArticleRole,
+    DocumentMathRole,
     DocumentNoteRole,
     DocumentRegionRole,
     
index 5202b34..f6e4949 100644 (file)
@@ -1047,6 +1047,7 @@ static const AccessibilityRoleMap& createAccessibilityRoleMap()
         { ApplicationTimerRole, NSAccessibilityGroupRole },
         { DocumentRole, NSAccessibilityGroupRole },
         { DocumentArticleRole, NSAccessibilityGroupRole },
+        { DocumentMathRole, NSAccessibilityGroupRole },
         { DocumentNoteRole, NSAccessibilityGroupRole },
         { DocumentRegionRole, NSAccessibilityGroupRole },
         { UserInterfaceTooltipRole, NSAccessibilityGroupRole },
@@ -1138,6 +1139,8 @@ static NSString* roleValueToNSString(AccessibilityRole value)
             return @"AXDocument";
         case DocumentArticleRole:
             return @"AXDocumentArticle";
+        case DocumentMathRole:
+            return @"AXDocumentMath";
         case DocumentNoteRole:
             return @"AXDocumentNote";
         case DocumentRegionRole:
@@ -1205,6 +1208,8 @@ static NSString* roleValueToNSString(AccessibilityRole value)
                 return AXARIAContentGroupText(@"ARIADocument");
             case DocumentArticleRole:
                 return AXARIAContentGroupText(@"ARIADocumentArticle");
+            case DocumentMathRole:
+                return AXARIAContentGroupText(@"ARIADocumentMath");
             case DocumentNoteRole:
                 return AXARIAContentGroupText(@"ARIADocumentNote");
             case DocumentRegionRole:
index ab9bc82..2973a99 100644 (file)
@@ -1,3 +1,13 @@
+2009-11-20  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        WAI-ARIA: add support for 'math' role
+        https://bugs.webkit.org/show_bug.cgi?id=31706
+
+        * English.lproj/Localizable.strings:
+        * StringsNotToBeLocalized.txt:
+
 2009-11-19  Eric Carlson  <eric.carlson@apple.com>
 
         Reviewed by Dan Bernstein.
index cb3c322..fb857f5 100644 (file)
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
index 62eb49e..90b29be 100644 (file)
 "ARIAApplicationTimer"
 "ARIADocument"
 "ARIADocumentArticle"
+"ARIADocumentMath"
 "ARIADocumentNote"
 "ARIADocumentRegion"
 "ARIALandmarkApplication"
index c80dabf..b7e142e 100644 (file)
@@ -1,3 +1,13 @@
+2009-11-20  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        WAI-ARIA: add support for 'math' role
+        https://bugs.webkit.org/show_bug.cgi?id=31706
+
+        * WebCoreSupport/WebViewFactory.mm:
+        (-[WebViewFactory AXARIAContentGroupText:]):
+
 2009-11-19  Eric Carlson  <eric.carlson@apple.com>
 
         Reviewed by Dan Bernstein.
index 7ea9055..99729dc 100644 (file)
         return UI_STRING("tooltip", "An ARIA accessibility group that acts as a tooltip.");    
     if ([ariaType isEqualToString:@"ARIATabPanel"])
         return UI_STRING("tab panel", "An ARIA accessibility group that contains the content of a tab.");
+    if ([ariaType isEqualToString:@"ARIADocumentMath"])
+        return UI_STRING("math", "An ARIA accessibility group that contains mathematical symbols.");
     return nil;
 }