Changeset 200415 in webkit


Ignore:
Timestamp:
May 4, 2016 5:54:59 AM (8 years ago)
Author:
jdiggs@igalia.com
Message:

AX: ARIA 'region' role is now a landmark; HTML 'section' element should be a landmark only if named
https://bugs.webkit.org/show_bug.cgi?id=157331

Reviewed by Chris Fleizach.

Source/WebCore:

The 'region' role is now mapped as a landmark: The WebCore DocumentRegionRole
AccessibilityRole has been renamed to LandmarkRegionRole. The AXDocumentRegion
subrole has been renamed to AXLandmarkRegion. A 'section' element is mapped to
the LandmarkRegionRole if it has an author-provided accessible name via either
the aria-label or aria-labelledby attribute. Otherwise, it is mapped as GroupRole
with no subrole.

Our existing test coverage for exposure of the 'region' role and the 'section'
element is sufficient. These tests were updated to reflect the new behavior.
Several new test cases were added to cover both sections with accessible names
and those without.

  • accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::accessibleNameDerivesFromContent):
(WebCore::AccessibilityObject::isLandmark):
(WebCore::initializeRoleMap):

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

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

  • accessibility/atk/WebKitAccessibleWrapperAtk.cpp:

(atkRole):

  • accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

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

  • accessibility/mac/WebAccessibilityObjectWrapperBase.mm:

(-[WebAccessibilityObjectWrapperBase ariaLandmarkRoleDescription]):

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

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

  • platform/LocalizedStrings.cpp:

(WebCore::AXARIAContentGroupText):

Source/WebKit/win:

As part of this change, the WebCore DocumentRegionRole AccessibilityRole has
been renamed to LandmarkRegionRole. Update MSAARole() to use the new name.

  • AccessibleBase.cpp:

(MSAARole):

Tools:

Add AXLandmarkRegion to the landmark strings handled by roleToString
for objects with ATK_ROLE_LANDMARK.

  • WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:

LayoutTests:

Our existing test coverage for exposure of the 'region' role and the 'section'
element is sufficient. These tests were updated to reflect the new behavior.
Several new test cases were added to cover both sections with accessible names
and those without.

  • accessibility/gtk/xml-roles-exposed-expected.txt: Updated.
  • accessibility/mac/aria-grouping-roles-expected.txt: Updated.
  • accessibility/mac/aria-grouping-roles.html: Updated.
  • accessibility/mac/html-section-elements-expected.txt: Updated.
  • accessibility/mac/html-section-elements.html: Updated.
  • accessibility/mac/landmark-not-ignored-expected.txt: Updated.
  • accessibility/mac/landmark-not-ignored.html: Updated.
  • accessibility/roles-computedRoleString-expected.txt: Updated.
  • accessibility/roles-computedRoleString.html: New test cases added.
  • accessibility/roles-exposed.html: New test cases added.
  • platform/efl/accessibility/roles-exposed-expected.txt: Updated.
  • platform/gtk/accessibility/roles-computedRoleString-expected.txt: Updated.
  • platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
  • platform/mac-mavericks/accessibility/roles-exposed-expected.txt: Updated.
  • platform/mac/accessibility/roles-exposed-expected.txt: Updated.
  • platform/win/accessibility/roles-exposed-expected.txt: Updated.
Location:
trunk
Files:
30 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r200414 r200415  
     12016-05-04  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        AX: ARIA 'region' role is now a landmark; HTML 'section' element should be a landmark only if named
     4        https://bugs.webkit.org/show_bug.cgi?id=157331
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Our existing test coverage for exposure of the 'region' role and the 'section'
     9        element is sufficient. These tests were updated to reflect the new behavior.
     10        Several new test cases were added to cover both sections with accessible names
     11        and those without.
     12
     13        * accessibility/gtk/xml-roles-exposed-expected.txt: Updated.
     14        * accessibility/mac/aria-grouping-roles-expected.txt: Updated.
     15        * accessibility/mac/aria-grouping-roles.html: Updated.
     16        * accessibility/mac/html-section-elements-expected.txt: Updated.
     17        * accessibility/mac/html-section-elements.html: Updated.
     18        * accessibility/mac/landmark-not-ignored-expected.txt: Updated.
     19        * accessibility/mac/landmark-not-ignored.html: Updated.
     20        * accessibility/roles-computedRoleString-expected.txt: Updated.
     21        * accessibility/roles-computedRoleString.html: New test cases added.
     22        * accessibility/roles-exposed.html: New test cases added.
     23        * platform/efl/accessibility/roles-exposed-expected.txt: Updated.
     24        * platform/gtk/accessibility/roles-computedRoleString-expected.txt: Updated.
     25        * platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
     26        * platform/mac-mavericks/accessibility/roles-exposed-expected.txt: Updated.
     27        * platform/mac/accessibility/roles-exposed-expected.txt: Updated.
     28        * platform/win/accessibility/roles-exposed-expected.txt: Updated.
     29
    1302016-05-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    231
  • trunk/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt

    r187777 r200415  
    519519AXPlatformAttributes: computed-role:radio, xml-roles:radio, tag:div, toolkit:WebKitGtk
    520520------------
    521 AXRole: AXGroup
     521AXRole: AXLandmarkRegion
    522522AXParent: AXWebArea
    523523AXChildren: 0
  • trunk/LayoutTests/accessibility/mac/aria-grouping-roles-expected.txt

    r199260 r200415  
    5555PASS obj.childAtIndex(k).roleDescription is "AXRoleDescription: navigation"
    5656PASS obj.childAtIndex(k).role is 'AXRole: AXGroup'
    57 PASS obj.childAtIndex(k).subrole is "AXSubrole: AXDocumentRegion"
     57PASS obj.childAtIndex(k).subrole is "AXSubrole: AXLandmarkRegion"
    5858PASS obj.childAtIndex(k).roleDescription is "AXRoleDescription: region"
    5959PASS obj.childAtIndex(k).role is 'AXRole: AXGroup'
  • trunk/LayoutTests/accessibility/mac/aria-grouping-roles.html

    r199260 r200415  
    3939          var subroles = new Array("AXWebApplication","AXDocumentArticle","AXLandmarkBanner","AXLandmarkComplementary",
    4040                          "AXLandmarkContentInfo", "AXDocument", "AXApplicationLog", "AXLandmarkMain", "AXApplicationMarquee",
    41                           "AXDocumentNote", "AXLandmarkNavigation", "AXDocumentRegion", "AXLandmarkSearch", "AXApplicationStatus",
     41                          "AXDocumentNote", "AXLandmarkNavigation", "AXLandmarkRegion", "AXLandmarkSearch", "AXApplicationStatus",
    4242                          "AXUserInterfaceTooltip", "AXDocumentMath", "AXDefinition");
    4343
  • trunk/LayoutTests/accessibility/mac/html-section-elements-expected.txt

    r187799 r200415  
    1616PASS body.childAtIndex(0).subrole is 'AXSubrole: AXLandmarkBanner'
    1717PASS body.childAtIndex(1).subrole is 'AXSubrole: AXLandmarkContentInfo'
    18 PASS body.childAtIndex(2).subrole is 'AXSubrole: AXDocumentRegion'
     18PASS body.childAtIndex(2).subrole is 'AXSubrole: '
    1919PASS body.childAtIndex(3).subrole is 'AXSubrole: AXDocumentArticle'
    2020PASS body.childAtIndex(4).subrole is 'AXSubrole: AXLandmarkNavigation'
  • trunk/LayoutTests/accessibility/mac/html-section-elements.html

    r187799 r200415  
    3636          shouldBe("body.childAtIndex(0).subrole", "'AXSubrole: AXLandmarkBanner'");
    3737          shouldBe("body.childAtIndex(1).subrole", "'AXSubrole: AXLandmarkContentInfo'");
    38           shouldBe("body.childAtIndex(2).subrole", "'AXSubrole: AXDocumentRegion'");
     38          shouldBe("body.childAtIndex(2).subrole", "'AXSubrole: '");
    3939          shouldBe("body.childAtIndex(3).subrole", "'AXSubrole: AXDocumentArticle'");
    4040          shouldBe("body.childAtIndex(4).subrole", "'AXSubrole: AXLandmarkNavigation'");
  • trunk/LayoutTests/accessibility/mac/landmark-not-ignored-expected.txt

    r187799 r200415  
    2525PASS el.subrole is "AXSubrole: AXDocumentArticle"
    2626PASS el.role is "AXRole: AXGroup"
    27 PASS el.subrole is "AXSubrole: AXDocumentRegion"
     27PASS el.subrole is "AXSubrole: "
    2828PASS successfullyParsed is true
    2929
  • trunk/LayoutTests/accessibility/mac/landmark-not-ignored.html

    r187799 r200415  
    2828
    2929        var subroles = [
    30             "LandmarkBanner",
    31             "LandmarkComplementary",
    32             "LandmarkContentInfo",
    33             "LandmarkMain",
    34             "LandmarkNavigation",
    35             "DocumentArticle",
    36             "DocumentRegion"
     30            "AXLandmarkBanner",
     31            "AXLandmarkComplementary",
     32            "AXLandmarkContentInfo",
     33            "AXLandmarkMain",
     34            "AXLandmarkNavigation",
     35            "AXDocumentArticle",
     36            ""
    3737        ];
    3838        for (var i = 0; i < test.childrenCount; i++) {
    3939            var el = test.childAtIndex(i);
    4040            shouldBeEqualToString("el.role", "AXRole: AXGroup");
    41             shouldBeEqualToString("el.subrole", "AXSubrole: AX" + subroles[i]);
     41            shouldBeEqualToString("el.subrole", "AXSubrole: " + subroles[i]);
    4242        }
    4343    }
  • trunk/LayoutTests/accessibility/roles-computedRoleString-expected.txt

    r200214 r200415  
    5353PASS: progress -> progressbar.
    5454PASS: samp -> .
    55 PASS: section -> region.
     55PASS: section:not([aria-label]:not([aria-labelledby]) -> group.
     56PASS: section[aria-label] -> region.
     57PASS: section[aria-labelledby] -> region.
    5658PASS: select:not([multiple]) -> .
    5759PASS: select[multiple] -> listbox.
  • trunk/LayoutTests/accessibility/roles-computedRoleString.html

    r199110 r200415  
    7777<samp data-role="" class="ex">X</samp>
    7878<!-- skipped <script> -->
    79 <section data-role="region" class="ex">X</section>
     79<section data-role="group" class="ex" data-note=":not([aria-label]:not([aria-labelledby])">X</section>
     80<section data-role="region" class="ex" aria-label="x" data-note="[aria-label]">X</section>
     81<section data-role="region" class="ex" aria-labelledby="section-label" data-note="[aria-labelledby]">
     82    <h2 id="section-label">X</h2>
     83</section>
    8084<select data-role="" class="ex" data-note=":not([multiple])">
    8185    <option data-role="" class="ex">X</option>
  • trunk/LayoutTests/accessibility/roles-exposed.html

    r180621 r200415  
    162162<samp data-platform="atk,mac" class="ex">X</samp>
    163163<!-- skipped <script> -->
    164 <!-- http://webkit.org/b/109024 --><section data-platform="atk,mac" class="ex">X</section>
     164<!-- http://webkit.org/b/109024 --><section data-platform="atk,mac" data-note=":not([aria-label]:not([aria-labelledby])" class="ex">X</section>
     165<section data-platform="atk,mac" class="ex" aria-label="x" data-note="[aria-label]">X</section>
     166<section data-platform="atk,mac" class="ex" aria-labelledby="section-label" data-note="[aria-labelledby]">
     167    <h2 id="section-label">X</h2>
     168</section>
    165169<select data-platform="atk,mac" class="ex" data-note=":not([multiple])">
    166170    <option data-platform="atk,mac" class="ex">X</option>
  • trunk/LayoutTests/platform/efl/accessibility/roles-exposed-expected.txt

    r183932 r200415  
    350350      AXRole:
    351351     
    352 section
    353       AXRole: AXGroup
     352section:not([aria-label]:not([aria-labelledby])
     353      AXRole: AXGroup
     354     
     355section[aria-label]
     356      AXRole: AXLandmarkRegion
     357     
     358section[aria-labelledby]
     359      AXRole: AXLandmarkRegion
    354360     
    355361select:not([multiple])
     
    624630     
    625631div[role=region]
    626       AXRole: AXGroup
     632      AXRole: AXLandmarkRegion
    627633     
    628634div[role=scrollbar]
  • trunk/LayoutTests/platform/gtk/accessibility/roles-computedRoleString-expected.txt

    r200240 r200415  
    5353PASS: progress -> progressbar.
    5454PASS: samp -> .
    55 PASS: section -> region.
     55PASS: section:not([aria-label]:not([aria-labelledby]) -> group.
     56PASS: section[aria-label] -> region.
     57PASS: section[aria-labelledby] -> region.
    5658PASS: select:not([multiple]) -> .
    5759PASS: option -> .
  • trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt

    r200222 r200415  
    350350      AXRole: AXStatic
    351351     
    352 section
    353       AXRole: AXGroup
     352section:not([aria-label]:not([aria-labelledby])
     353      AXRole: AXGroup
     354     
     355section[aria-label]
     356      AXRole: AXLandmarkRegion
     357     
     358section[aria-labelledby]
     359      AXRole: AXLandmarkRegion
    354360     
    355361select:not([multiple])
     
    624630     
    625631div[role=region]
    626       AXRole: AXGroup
     632      AXRole: AXLandmarkRegion
    627633     
    628634div[role=scrollbar]
  • trunk/LayoutTests/platform/mac-mavericks/accessibility/roles-exposed-expected.txt

    r198543 r200415  
    580580      AXRoleDescription:
    581581     
    582 section
    583       AXRole: AXGroup
    584       AXSubrole: AXDocumentRegion
     582section:not([aria-label]:not([aria-labelledby])
     583      AXRole: AXGroup
     584      AXSubrole:
     585      AXRoleDescription: group
     586     
     587section[aria-label]
     588      AXRole: AXGroup
     589      AXSubrole: AXLandmarkRegion
     590      AXRoleDescription: region
     591     
     592section[aria-labelledby]
     593      AXRole: AXGroup
     594      AXSubrole: AXLandmarkRegion
    585595      AXRoleDescription: region
    586596     
     
    10371047div[role=region]
    10381048      AXRole: AXGroup
    1039       AXSubrole: AXDocumentRegion
     1049      AXSubrole: AXLandmarkRegion
    10401050      AXRoleDescription: region
    10411051     
  • trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt

    r200214 r200415  
    580580      AXRoleDescription: group
    581581     
    582 section
    583       AXRole: AXGroup
    584       AXSubrole: AXDocumentRegion
     582section:not([aria-label]:not([aria-labelledby])
     583      AXRole: AXGroup
     584      AXSubrole:
     585      AXRoleDescription: group
     586     
     587section[aria-label]
     588      AXRole: AXGroup
     589      AXSubrole: AXLandmarkRegion
     590      AXRoleDescription: region
     591     
     592section[aria-labelledby]
     593      AXRole: AXGroup
     594      AXSubrole: AXLandmarkRegion
    585595      AXRoleDescription: region
    586596     
     
    10371047div[role=region]
    10381048      AXRole: AXGroup
    1039       AXSubrole: AXDocumentRegion
     1049      AXSubrole: AXLandmarkRegion
    10401050      AXRoleDescription: region
    10411051     
  • trunk/LayoutTests/platform/win/accessibility/roles-exposed-expected.txt

    r180176 r200415  
    580580      AXRoleDescription:
    581581     
    582 section
    583       AXRole: AXGroup
    584       AXSubrole: AXDocumentRegion
     582section:not([aria-label]:not([aria-labelledby])
     583      AXRole: AXGroup
     584      AXSubrole:
     585      AXRoleDescription: group
     586     
     587section[aria-label]
     588      AXRole: AXGroup
     589      AXSubrole: AXLandmarkRegion
     590      AXRoleDescription: region
     591     
     592section[aria-labelledby]
     593      AXRole: AXGroup
     594      AXSubrole: AXLandmarkRegion
    585595      AXRoleDescription: region
    586596     
     
    10371047div[role=region]
    10381048      AXRole: AXGroup
    1039       AXSubrole: AXDocumentRegion
     1049      AXSubrole: AXLandmarkRegion
    10401050      AXRoleDescription: region
    10411051     
  • trunk/Source/WebCore/ChangeLog

    r200414 r200415  
     12016-05-04  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        AX: ARIA 'region' role is now a landmark; HTML 'section' element should be a landmark only if named
     4        https://bugs.webkit.org/show_bug.cgi?id=157331
     5
     6        Reviewed by Chris Fleizach.
     7
     8        The 'region' role is now mapped as a landmark: The WebCore DocumentRegionRole
     9        AccessibilityRole has been renamed to LandmarkRegionRole. The AXDocumentRegion
     10        subrole has been renamed to AXLandmarkRegion. A 'section' element is mapped to
     11        the LandmarkRegionRole if it has an author-provided accessible name via either
     12        the aria-label or aria-labelledby attribute. Otherwise, it is mapped as GroupRole
     13        with no subrole.
     14
     15        Our existing test coverage for exposure of the 'region' role and the 'section'
     16        element is sufficient. These tests were updated to reflect the new behavior.
     17        Several new test cases were added to cover both sections with accessible names
     18        and those without.
     19
     20        * accessibility/AccessibilityObject.cpp:
     21        (WebCore::AccessibilityObject::accessibleNameDerivesFromContent):
     22        (WebCore::AccessibilityObject::isLandmark):
     23        (WebCore::initializeRoleMap):
     24        * accessibility/AccessibilityObject.h:
     25        * accessibility/AccessibilityRenderObject.cpp:
     26        (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
     27        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
     28        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
     29        (atkRole):
     30        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
     31        (-[WebAccessibilityObjectWrapper _accessibilityIsLandmarkRole:]):
     32        (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
     33        * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
     34        (-[WebAccessibilityObjectWrapperBase ariaLandmarkRoleDescription]):
     35        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     36        (createAccessibilityRoleMap):
     37        (-[WebAccessibilityObjectWrapper subrole]):
     38        * platform/LocalizedStrings.cpp:
     39        (WebCore::AXARIAContentGroupText):
     40
    1412016-05-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    242
  • trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

    r200369 r200415  
    311311    case DocumentMathRole:
    312312    case DocumentNoteRole:
    313     case DocumentRegionRole:
     313    case LandmarkRegionRole:
    314314    case FormRole:
    315315    case GridRole:
     
    407407        || role == LandmarkMainRole
    408408        || role == LandmarkNavigationRole
     409        || role == LandmarkRegionRole
    409410        || role == LandmarkSearchRole;
    410411}
     
    20772078        { "radio", RadioButtonRole },
    20782079        { "radiogroup", RadioGroupRole },
    2079         { "region", DocumentRegionRole },
     2080        { "region", LandmarkRegionRole },
    20802081        { "row", RowRole },
    20812082        { "rowgroup", RowGroupRole },
  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r200369 r200415  
    128128    DocumentMathRole,
    129129    DocumentNoteRole,
    130     DocumentRegionRole,           
    131130    DrawerRole,
    132131    EditableTextRole,
     
    152151    LandmarkMainRole,
    153152    LandmarkNavigationRole,
     153    LandmarkRegionRole,
    154154    LandmarkSearchRole,
    155155    LegendRole,
  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r200369 r200415  
    12551255    case DetailsRole:
    12561256    case DocumentArticleRole:
    1257     case DocumentRegionRole:
     1257    case LandmarkRegionRole:
    12581258    case ListItemRole:
    12591259    case VideoRole:
     
    27002700        return LandmarkComplementaryRole;
    27012701
     2702    // The default role attribute value for the section element, region, became a landmark in ARIA 1.1.
     2703    // The HTML AAM spec says it is "strongly recommended" that ATs only convey and provide navigation
     2704    // for section elements which have names.
    27022705    if (node && node->hasTagName(sectionTag))
    2703         return DocumentRegionRole;
     2706        return hasAttribute(aria_labelAttr) || hasAttribute(aria_labelledbyAttr) ? LandmarkRegionRole : GroupRole;
    27042707
    27052708    if (node && node->hasTagName(addressTag))
  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp

    r200245 r200415  
    598598    case ApplicationRole:
    599599        return ATK_ROLE_APPLICATION;
    600     case DocumentRegionRole:
    601600    case RadioGroupRole:
    602601    case SVGRootRole:
     
    715714    case LandmarkMainRole:
    716715    case LandmarkNavigationRole:
     716    case LandmarkRegionRole:
    717717    case LandmarkSearchRole:
    718718        return ATK_ROLE_LANDMARK;
  • trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

    r200098 r200415  
    503503    case DocumentArticleRole:
    504504    case DocumentNoteRole:
    505     case DocumentRegionRole:
    506505    case FooterRole:
    507506    case LandmarkBannerRole:
     
    510509    case LandmarkMainRole:
    511510    case LandmarkNavigationRole:
     511    case LandmarkRegionRole:
    512512    case LandmarkSearchRole:
    513513        return YES;
     
    810810        case DocumentArticleRole:
    811811        case DocumentNoteRole:
    812         case DocumentRegionRole:
    813812        case DrawerRole:
    814813        case EditableTextRole:
     
    827826        case LandmarkMainRole:
    828827        case LandmarkNavigationRole:
     828        case LandmarkRegionRole:
    829829        case LandmarkSearchRole:
    830830        case LegendRole:
  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm

    r199260 r200415  
    333333    case LandmarkNavigationRole:
    334334        return AXARIAContentGroupText(@"ARIALandmarkNavigation");
     335    case LandmarkRegionRole:
     336        return AXARIAContentGroupText(@"ARIALandmarkRegion");
    335337    case LandmarkSearchRole:
    336338        return AXARIAContentGroupText(@"ARIALandmarkSearch");
     
    357359    case DocumentNoteRole:
    358360        return AXARIAContentGroupText(@"ARIADocumentNote");
    359     case DocumentRegionRole:
    360         return AXARIAContentGroupText(@"ARIADocumentRegion");
    361361    case UserInterfaceTooltipRole:
    362362        return AXARIAContentGroupText(@"ARIAUserInterfaceTooltip");
  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r200214 r200415  
    21602160        { LandmarkMainRole, NSAccessibilityGroupRole },
    21612161        { LandmarkNavigationRole, NSAccessibilityGroupRole },
     2162        { LandmarkRegionRole, NSAccessibilityGroupRole },
    21622163        { LandmarkSearchRole, NSAccessibilityGroupRole },
    21632164        { ApplicationAlertRole, NSAccessibilityGroupRole },
     
    21722173        { DocumentMathRole, NSAccessibilityGroupRole },
    21732174        { DocumentNoteRole, NSAccessibilityGroupRole },
    2174         { DocumentRegionRole, NSAccessibilityGroupRole },
    21752175        { UserInterfaceTooltipRole, NSAccessibilityGroupRole },
    21762176        { TabRole, NSAccessibilityRadioButtonRole },
     
    23012301        case LandmarkNavigationRole:
    23022302            return @"AXLandmarkNavigation";
     2303        case LandmarkRegionRole:
     2304            return @"AXLandmarkRegion";
    23032305        case LandmarkSearchRole:
    23042306            return @"AXLandmarkSearch";
     
    23252327        case DocumentNoteRole:
    23262328            return @"AXDocumentNote";
    2327         case DocumentRegionRole:
    2328             return @"AXDocumentRegion";
    23292329        case UserInterfaceTooltipRole:
    23302330            return @"AXUserInterfaceTooltip";
  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r199260 r200415  
    711711    if (ariaType == "ARIADocumentNote")
    712712        return WEB_UI_STRING("note", "An ARIA accessibility group that acts as a note in a document.");
    713     if (ariaType == "ARIADocumentRegion")
    714         return WEB_UI_STRING("region", "An ARIA accessibility group that acts as a distinct region in a document.");
    715713    if (ariaType == "ARIAWebApplication")
    716714        return WEB_UI_STRING("web application", "An ARIA accessibility group that acts as an application.");
     
    725723    if (ariaType == "ARIALandmarkNavigation")
    726724        return WEB_UI_STRING("navigation", "An ARIA accessibility group that contains the main navigation elements of a website.");
     725    if (ariaType == "ARIALandmarkRegion")
     726        return WEB_UI_STRING("region", "An ARIA accessibility group that acts as a distinct region in a document.");
    727727    if (ariaType == "ARIALandmarkSearch")
    728728        return WEB_UI_STRING("search", "An ARIA accessibility group that contains a search feature of a website.");
  • trunk/Source/WebKit/win/AccessibleBase.cpp

    r199260 r200415  
    968968        case WebCore::DocumentArticleRole:
    969969        case WebCore::DocumentNoteRole:
    970         case WebCore::DocumentRegionRole:
    971970            return ROLE_SYSTEM_GROUPING;
    972971        case WebCore::DocumentMathRole:
     
    981980        case WebCore::LandmarkMainRole:
    982981        case WebCore::LandmarkNavigationRole:
     982        case WebCore::LandmarkRegionRole:
    983983        case WebCore::LandmarkSearchRole:
    984984        case WebCore::LegendRole:
  • trunk/Source/WebKit/win/ChangeLog

    r200036 r200415  
     12016-05-04  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        AX: ARIA 'region' role is now a landmark; HTML 'section' element should be a landmark only if named
     4        https://bugs.webkit.org/show_bug.cgi?id=157331
     5
     6        Reviewed by Chris Fleizach.
     7
     8        As part of this change, the WebCore DocumentRegionRole AccessibilityRole has
     9        been renamed to LandmarkRegionRole. Update MSAARole() to use the new name.
     10
     11        * AccessibleBase.cpp:
     12        (MSAARole):
     13
    1142016-04-25  Per Arne Vollan  <peavo@outlook.com>
    215
  • trunk/Tools/ChangeLog

    r200403 r200415  
     12016-05-04  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        AX: ARIA 'region' role is now a landmark; HTML 'section' element should be a landmark only if named
     4        https://bugs.webkit.org/show_bug.cgi?id=157331
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Add AXLandmarkRegion to the landmark strings handled by roleToString
     9        for objects with ATK_ROLE_LANDMARK.
     10
     11        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
     12
    1132016-05-03  Beth Dakin  <bdakin@apple.com>
    214
  • trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp

    r200397 r200415  
    106106const char* landmarkStringMain = "AXLandmarkMain";
    107107const char* landmarkStringNavigation = "AXLandmarkNavigation";
     108const char* landmarkStringRegion = "AXLandmarkRegion";
    108109const char* landmarkStringSearch = "AXLandmarkSearch";
    109110#endif
     
    332333        if (equalLettersIgnoringASCIICase(xmlRolesValue, "navigation"))
    333334            return landmarkStringNavigation;
     335        if (equalLettersIgnoringASCIICase(xmlRolesValue, "region"))
     336            return landmarkStringRegion;
    334337        if (equalLettersIgnoringASCIICase(xmlRolesValue, "search"))
    335338            return landmarkStringSearch;
Note: See TracChangeset for help on using the changeset viewer.