Changeset 199110 in webkit


Ignore:
Timestamp:
Apr 6, 2016 12:13:50 PM (8 years ago)
Author:
jdiggs@igalia.com
Message:

REGRESSION(r195463): [GTK] accessibility/roles-computedRoleString.html and accessibility/roles-exposed.html failing
​https://bugs.webkit.org/show_bug.cgi?id=153696

Reviewed by Chris Fleizach.

Source/WebCore:

The failures were due to always mapping style format groups to GroupRole, even for
RenderInline objects. The fix is to expose inline style format groups as InlineRole,
add handling of GroupRole style groups to the ATK code, and InlineRole style groups
to the Mac code.

No new tests because we have sufficient coverage. Updated roles-computedRoleString.html
to reflect new exposure.

  • accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::determineAccessibilityRole):

  • accessibility/atk/WebKitAccessibleWrapperAtk.cpp:

(atkRole):

  • accessibility/mac/AccessibilityObjectMac.mm:

(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

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

LayoutTests:

Now that RenderInline style format groups are exposed as InlineRole, there is
no longer a corresponding computed role for ins, samp, and var elements. Updated
the roles-computedRoleString.html test and expectations accordingly. Also added
the now-correct results for Gtk for both of the previously-failing tests.

  • accessibility/roles-computedRoleString-expected.txt: Updated.
  • accessibility/roles-computedRoleString.html: Updated.
  • platform/gtk/TestExpectations: Unskip the two tests which are now passing.
  • platform/gtk/accessibility/roles-computedRoleString-expected.txt: Updated.
  • platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r199106 r199110  
     12016-04-06  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        REGRESSION(r195463): [GTK] accessibility/roles-computedRoleString.html and accessibility/roles-exposed.html failing
     4        https://bugs.webkit.org/show_bug.cgi?id=153696
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Now that RenderInline style format groups are exposed as InlineRole, there is
     9        no longer a corresponding computed role for ins, samp, and var elements. Updated
     10        the roles-computedRoleString.html test and expectations accordingly. Also added
     11        the now-correct results for Gtk for both of the previously-failing tests.
     12
     13        * accessibility/roles-computedRoleString-expected.txt: Updated.
     14        * accessibility/roles-computedRoleString.html: Updated.
     15        * platform/gtk/TestExpectations: Unskip the two tests which are now passing.
     16        * platform/gtk/accessibility/roles-computedRoleString-expected.txt: Updated.
     17        * platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
     18
    1192016-04-06  Keith Miller  <keith_miller@apple.com>
    220

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

    r195463 r199110  
    4343PASS: input[type='url'] -> .
    4444PASS: input[type='week'] -> .
    45 PASS: ins -> group.
     45PASS: ins -> .
    4646PASS: math -> math.
    4747PASS: meter -> progressbar.
    … …  
    5252PASS: pre -> group.
    5353PASS: progress -> progressbar.
    54 PASS: samp -> group.
     54PASS: samp -> .
    5555PASS: section -> region.
    5656PASS: select:not([multiple]) -> .
    … …  
    7777PASS: ul -> list.
    7878PASS: li -> listitem.
    79 PASS: var -> group.
     79PASS: var -> .
    8080PASS: div[role="command"] -> .
    8181PASS: div[role="composite"] -> .

  • trunk/LayoutTests/accessibility/roles-computedRoleString.html

    r195463 r199110  
    5353<input type="url" value="X" data-role="" class="ex" data-note="[type='url']">
    5454<input type="week" value="X" data-role="" class="ex" data-note="[type='week']">
    55 <ins data-role="group" class="ex">X</ins>
     55<ins data-role="" class="ex">X</ins>
    5656<mark data-role="" class="ex">X</mark>
    5757<math data-role="math" class="ex">X</math>
    … …  
    7575<!-- skipped <ruby/rp/rt> -->
    7676<s data-role="" class="ex">X</s>
    77 <samp data-role="group" class="ex">X</samp>
     77<samp data-role="" class="ex">X</samp>
    7878<!-- skipped <script> -->
    7979<section data-role="region" class="ex">X</section>
    … …  
    141141    <li data-role="listitem" class="ex">X</li>
    142142</ul>
    143 <var data-role="group" class="ex">X</var>
     143<var data-role="" class="ex">X</var>
    144144<wbr data-role="" class="ex">X</wbr>
    145145

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r198993 r199110  
    26632663webkit.org/b/153602 tables/mozilla_expected_failures/bugs/bug89315.html [ Failure ]
    26642664
    2665 webkit.org/b/153696 accessibility/roles-computedRoleString.html [ Failure ]
    2666 webkit.org/b/153696 accessibility/roles-exposed.html [ Failure ]
    2667 
    26682665webkit.org/b/153697 http/tests/security/contentSecurityPolicy/object-src-applet-archive-codebase.html [ Failure ]
    26692666webkit.org/b/153697 http/tests/security/contentSecurityPolicy/object-src-applet-archive.html [ Failure ]

  • trunk/LayoutTests/platform/gtk/accessibility/roles-computedRoleString-expected.txt

    r193746 r199110  
    4343PASS: input[type='url'] -> .
    4444PASS: input[type='week'] -> .
     45PASS: ins -> .
    4546PASS: math -> math.
    4647PASS: meter -> progressbar.
    … …  
    4950PASS: li -> listitem.
    5051PASS: p -> .
    51 PASS: pre -> .
     52PASS: pre -> group.
    5253PASS: progress -> progressbar.
     54PASS: samp -> .
    5355PASS: section -> region.
    5456PASS: select:not([multiple]) -> .
    … …  
    7880PASS: ul -> list.
    7981PASS: li -> listitem.
     82PASS: var -> .
    8083PASS: div[role="command"] -> .
    8184PASS: div[role="composite"] -> .

  • trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt

    r189467 r199110  
    4545     
    4646cite
    47       AXRole:
     47      AXRole: AXStatic
    4848     
    4949code
    50       AXRole:
     50      AXRole: AXStatic
    5151     
    5252del:not([datetime])
    53       AXRole:
     53      AXRole: AXStatic
    5454     
    5555del[datetime]
    … …  
    204204     
    205205ins:not([datetime])
    206       AXRole:
     206      AXRole: AXStatic
    207207     
    208208ins[datetime]
    … …  
    348348     
    349349samp
    350       AXRole:
     350      AXRole: AXStatic
    351351     
    352352section
    … …  
    441441     
    442442var
    443       AXRole:
     443      AXRole: AXStatic
    444444     
    445445wbr

  • trunk/Source/WebCore/ChangeLog

    r199105 r199110  
     12016-04-06  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        REGRESSION(r195463): [GTK] accessibility/roles-computedRoleString.html and accessibility/roles-exposed.html failing
     4        https://bugs.webkit.org/show_bug.cgi?id=153696
     5
     6        Reviewed by Chris Fleizach.
     7
     8        The failures were due to always mapping style format groups to GroupRole, even for
     9        RenderInline objects. The fix is to expose inline style format groups as InlineRole,
     10        add handling of GroupRole style groups to the ATK code, and InlineRole style groups
     11        to the Mac code.
     12
     13        No new tests because we have sufficient coverage. Updated roles-computedRoleString.html
     14        to reflect new exposure.
     15
     16        * accessibility/AccessibilityRenderObject.cpp:
     17        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
     18        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
     19        (atkRole):
     20        * accessibility/mac/AccessibilityObjectMac.mm:
     21        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
     22        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     23        (createAccessibilityRoleMap):
     24        (-[WebAccessibilityObjectWrapper subrole]):
     25
    1262016-04-06  Jer Noble  <jer.noble@apple.com>
    227

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r198997 r199110  
    25942594   
    25952595    if (isStyleFormatGroup())
    2596         return GroupRole;
     2596        return is<RenderInline>(*m_renderer) ? InlineRole : GroupRole;
    25972597   
    25982598#if ENABLE(MATHML)

  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp

    r198254 r199110  
    591591        return ATK_ROLE_APPLICATION;
    592592    case DocumentRegionRole:
    593     case GroupRole:
    594593    case RadioGroupRole:
    595594    case SVGRootRole:
    596595    case TabPanelRole:
    597596        return ATK_ROLE_PANEL;
     597    case GroupRole:
     598        return coreObject->isStyleFormatGroup() ? ATK_ROLE_SECTION : ATK_ROLE_PANEL;
    598599    case RowHeaderRole:
    599600        return ATK_ROLE_ROW_HEADER;

  • trunk/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm

    r180718 r199110  
    9393        return IgnoreObject;
    9494   
    95     if (roleValue() == InlineRole)
     95    if (roleValue() == InlineRole && !isStyleFormatGroup())
    9696        return IgnoreObject;
    9797

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

    r198427 r199110  
    22082208        { SVGTextRole, NSAccessibilityGroupRole },
    22092209        { SVGTSpanRole, NSAccessibilityGroupRole },
     2210        { InlineRole, NSAccessibilityGroupRole },
    22102211    };
    22112212    AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
    … …  
    23952396        return NSAccessibilitySwitchSubrole;
    23962397
    2397     if (role == GroupRole) {
     2398    if (m_object->isStyleFormatGroup()) {
    23982399        if (Node* node = m_object->node()) {
    23992400            if (node->hasTagName(kbdTag))
Note: See TracChangeset for help on using the changeset viewer.