Changeset 147520 in webkit


Ignore:
Timestamp:
Apr 2, 2013 11:17:21 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

AXRoleDescripton for DL is "list"; should be "description list"
https://bugs.webkit.org/show_bug.cgi?id=111665

Patch by James Craig <james@cookiecrook.com> on 2013-04-02
Reviewed by Chris Fleizach.

Source/WebCore:

Defining the role and description strings, and accessors for DL.
This previously relied on getting the role and description from the platform API.

Updated existing test coverage.

  • English.lproj/Localizable.strings:
  • accessibility/AccessibilityObject.h:
  • accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::determineAccessibilityRole):

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

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

  • platform/LocalizedStrings.cpp:

(WebCore::AXDescriptionListText):
(WebCore):

  • platform/LocalizedStrings.h:

(WebCore):

  • platform/blackberry/LocalizedStringsBlackBerry.cpp:

(WebCore::AXDescriptionListText):
(WebCore):

  • platform/chromium/LocalizedStringsChromium.cpp:

(WebCore::AXDescriptionListText):
(WebCore):

  • platform/efl/LocalizedStringsEfl.cpp:

(WebCore::AXDescriptionListText):
(WebCore):

  • platform/gtk/LocalizedStringsGtk.cpp:

(WebCore::AXDescriptionListText):
(WebCore):

  • platform/qt/LocalizedStringsQt.cpp:

(WebCore::AXDescriptionListText):
(WebCore):

Source/WebKit/chromium:

Defining the role and description strings.

  • public/WebAccessibilityRole.h:
  • src/AssertMatchingEnums.cpp:

Tools:

Defining the role and description strings.

  • DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp:

LayoutTests:

Updating expectation strings for DL role description.

  • platform/mac/accessibility/lists-expected.txt:
  • platform/mac/accessibility/role-subrole-roledescription-expected.txt:
  • platform/mac/accessibility/role-subrole-roledescription.html:
Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r147518 r147520  
     12013-04-02  James Craig  <james@cookiecrook.com>
     2
     3        AXRoleDescripton for DL is "list"; should be "description list"
     4        https://bugs.webkit.org/show_bug.cgi?id=111665
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Updating expectation strings for DL role description.
     9
     10        * platform/mac/accessibility/lists-expected.txt:
     11        * platform/mac/accessibility/role-subrole-roledescription-expected.txt:
     12        * platform/mac/accessibility/role-subrole-roledescription.html:
     13
    1142013-04-02  Jer Noble  <jer.noble@apple.com>
    215
  • trunk/LayoutTests/platform/mac/accessibility/lists-expected.txt

    r140974 r147520  
    7070AXRole: AXList
    7171AXSubrole: AXDescriptionList
    72 AXRoleDescription: list
     72AXRoleDescription: description list
    7373AXChildren: <array of size 5>
    7474AXHelp:
  • trunk/LayoutTests/platform/mac/accessibility/role-subrole-roledescription-expected.txt

    r142185 r147520  
    8888      AXRole: AXList
    8989      AXSubrole: AXDescriptionList
    90       AXRoleDescription: list
     90      AXRoleDescription: description list
    9191     
    9292PASS: dt
  • trunk/LayoutTests/platform/mac/accessibility/role-subrole-roledescription.html

    r142185 r147520  
    2828<!-- skipped <details/summary> http://webkit.org/b/108979 -->
    2929<!-- <dfn> http://webkit.org/b/108980 --><dfn data-role="" data-subrole="" data-roledescription="" class="ex">X</dfn>
    30 <dl data-role="AXList" data-subrole="AXDescriptionList" data-roledescription="list" class="ex">
     30<dl data-role="AXList" data-subrole="AXDescriptionList" data-roledescription="description list" class="ex">
    3131    <dt data-role="AXGroup" data-subrole="AXTerm" data-roledescription="term" class="ex">X</dt>
    3232    <dd data-role="AXGroup" data-subrole="AXDescription" data-roledescription="description" class="ex">X</dd>
  • trunk/Source/WebCore/ChangeLog

    r147519 r147520  
     12013-04-02  James Craig  <james@cookiecrook.com>
     2
     3        AXRoleDescripton for DL is "list"; should be "description list"
     4        https://bugs.webkit.org/show_bug.cgi?id=111665
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Defining the role and description strings, and accessors for DL.
     9        This previously relied on getting the role and description from the platform API.
     10
     11        Updated existing test coverage.
     12
     13        * English.lproj/Localizable.strings:
     14        * accessibility/AccessibilityObject.h:
     15        * accessibility/AccessibilityRenderObject.cpp:
     16        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
     17        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     18        (createAccessibilityRoleMap):
     19        (-[WebAccessibilityObjectWrapper subrole]):
     20        (-[WebAccessibilityObjectWrapper roleDescription]):
     21        * platform/LocalizedStrings.cpp:
     22        (WebCore::AXDescriptionListText):
     23        (WebCore):
     24        * platform/LocalizedStrings.h:
     25        (WebCore):
     26        * platform/blackberry/LocalizedStringsBlackBerry.cpp:
     27        (WebCore::AXDescriptionListText):
     28        (WebCore):
     29        * platform/chromium/LocalizedStringsChromium.cpp:
     30        (WebCore::AXDescriptionListText):
     31        (WebCore):
     32        * platform/efl/LocalizedStringsEfl.cpp:
     33        (WebCore::AXDescriptionListText):
     34        (WebCore):
     35        * platform/gtk/LocalizedStringsGtk.cpp:
     36        (WebCore::AXDescriptionListText):
     37        (WebCore):
     38        * platform/qt/LocalizedStringsQt.cpp:
     39        (WebCore::AXDescriptionListText):
     40        (WebCore):
     41
    1422013-04-02  Eugene Klyuchnikov  <eustas@chromium.org>
    243
  • trunk/Source/WebCore/English.lproj/Localizable.strings

    r147343 r147520  
    644644"description" = "description";
    645645
     646/* description list */
     647"description list" = "description list";
     648
    646649/* An ARIA accessibility group that acts as an dialog. */
    647650"dialog" = "dialog";
  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r147439 r147520  
    113113    ComboBoxRole,
    114114    DefinitionRole,
     115    DescriptionListRole,
    115116    DescriptionListTermRole,
    116117    DescriptionListDetailRole,
  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r147439 r147520  
    24782478        return DescriptionListTermRole;
    24792479
     2480    if (node && node->hasTagName(dlTag))
     2481        return DescriptionListRole;
     2482
    24802483    if (node && (node->hasTagName(rpTag) || node->hasTagName(rtTag)))
    24812484        return AnnotationRole;
  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r147439 r147520  
    15911591        { DescriptionListDetailRole, NSAccessibilityGroupRole },
    15921592        { DescriptionListTermRole, NSAccessibilityGroupRole },
     1593        { DescriptionListRole, NSAccessibilityListRole },
    15931594        { SliderThumbRole, NSAccessibilityValueIndicatorRole },
    15941595        { LandmarkApplicationRole, NSAccessibilityGroupRole },
     
    17411742        case DefinitionRole:
    17421743            return @"AXDefinition";
     1744        case DescriptionListRole:
     1745            return @"AXDescriptionList";
    17431746        case DescriptionListTermRole:
    17441747            return @"AXTerm";
     
    18771880        return AXFileUploadButtonText();
    18781881   
     1882    // Only returning for DL (not UL or OL) because description changed with HTML5 from 'definition list' to
     1883    // superset 'description list' and does not return the same values in AX API on some OS versions.
     1884    if (m_object->isList()) {
     1885        AccessibilityList* listObject = static_cast<AccessibilityList*>(m_object);
     1886        if (listObject->isDescriptionList())
     1887            return AXDescriptionListText();
     1888    }
     1889   
    18791890    // AppKit also returns AXTab for the role description for a tab item.
    18801891    if (m_object->isTabItem())
  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r147343 r147520  
    561561{
    562562    return WEB_UI_STRING("definition", "role description of ARIA definition role");
     563}
     564
     565String AXDescriptionListText()
     566{
     567    return WEB_UI_STRING("description list", "accessibility role description of a description list");
    563568}
    564569
  • trunk/Source/WebCore/platform/LocalizedStrings.h

    r146380 r147520  
    154154    String AXHeadingText();
    155155    String AXDefinitionText();
     156    String AXDescriptionListText();
    156157    String AXDescriptionListTermText();
    157158    String AXDescriptionListDetailText();
  • trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp

    r142507 r147520  
    395395}
    396396
     397String AXDescriptionListText()
     398{
     399    notImplemented();
     400    return String();
     401}
     402
    397403String AXDescriptionListDetailText()
    398404{
  • trunk/Source/WebCore/platform/chromium/LocalizedStringsChromium.cpp

    r142507 r147520  
    150150    notImplemented();
    151151    return String("definition");
     152}
     153
     154String AXDescriptionListText()
     155{
     156    notImplemented();
     157    return String("description list");
    152158}
    153159
  • trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp

    r145025 r147520  
    364364}
    365365
     366String AXDescriptionListText()
     367{
     368    return String::fromUTF8("description list");
     369}
     370
    366371String AXDescriptionListTermText()
    367372{
  • trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp

    r147343 r147520  
    411411{
    412412    return String::fromUTF8(_("definition"));
     413}
     414
     415String AXDescriptionListText()
     416{
     417    return String::fromUTF8(_("description list"));
    413418}
    414419
  • trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp

    r143232 r147520  
    381381
    382382String AXDefinitionText()
     383{
     384    notImplemented();
     385    return String();
     386}
     387
     388String AXDescriptionListText()
    383389{
    384390    notImplemented();
  • trunk/Source/WebKit/chromium/ChangeLog

    r147491 r147520  
     12013-04-02  James Craig  <james@cookiecrook.com>
     2
     3        AXRoleDescripton for DL is "list"; should be "description list"
     4        https://bugs.webkit.org/show_bug.cgi?id=111665
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Defining the role and description strings.
     9
     10        * public/WebAccessibilityRole.h:
     11        * src/AssertMatchingEnums.cpp:
     12
    1132013-04-02  Raymond Toy  <rtoy@google.com>
    214
  • trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h

    r140974 r147520  
    5858    WebAccessibilityRoleComboBox,
    5959    WebAccessibilityRoleDefinition,
     60    WebAccessibilityRoleDescriptionList,
    6061    WebAccessibilityRoleDescriptionListTerm,
    6162    WebAccessibilityRoleDescriptionListDetail,
  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r147192 r147520  
    227227COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTableHeaderContainer, TableHeaderContainerRole);
    228228COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDefinition, DefinitionRole);
     229COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDescriptionList, DescriptionListRole);
    229230COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDescriptionListTerm, DescriptionListTermRole);
    230231COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDescriptionListDetail, DescriptionListDetailRole);
  • trunk/Tools/ChangeLog

    r147509 r147520  
     12013-04-02  James Craig  <james@cookiecrook.com>
     2
     3        AXRoleDescripton for DL is "list"; should be "description list"
     4        https://bugs.webkit.org/show_bug.cgi?id=111665
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Defining the role and description strings.
     9
     10        * DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp:
     11
    1122013-04-02  Roger Fong  <roger_fong@apple.com>
    213
  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp

    r142237 r147520  
    171171    case WebAccessibilityRoleDefinition:
    172172        return result.append("Definition");
     173    case WebAccessibilityRoleDescriptionList:
     174        return result.append("DescriptionList");
    173175    case WebAccessibilityRoleDescriptionListTerm:
    174176        return result.append("DescriptionListTerm");
Note: See TracChangeset for help on using the changeset viewer.