Changeset 154976 in webkit


Ignore:
Timestamp:
Sep 3, 2013 4:29:33 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Source/WebCore: [AX][ATK] Added support for sort and help attributes.
https://bugs.webkit.org/show_bug.cgi?id=120456

Patch by Krzysztof Czech <k.czech@samsung.com> on 2013-09-03
Reviewed by Chris Fleizach.

Added support for aria-sort and aria-help attributes.

Test: accessibility/aria-sort.html

  • accessibility/atk/WebKitAccessibleWrapperAtk.cpp:

(webkitAccessibleGetAttributes):

Tools: [AX][ATK] Added support for sort and help attributes
https://bugs.webkit.org/show_bug.cgi?id=120456

Patch by Krzysztof Czech <k.czech@samsung.com> on 2013-09-03
Reviewed by Chris Fleizach.

Added missing implementation to AccessibilityUIElement::helpText and support for
aria-sort attribute.

  • DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:

(coreAttributeToAtkAttribute):

  • WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:

(WTR::coreAttributeToAtkAttribute):
(WTR::AccessibilityUIElement::helpText):

LayoutTests: [AX][ATK] Added support for sort and help attributes
https://bugs.webkit.org/show_bug.cgi?id=120456

Patch by Krzysztof Czech <k.czech@samsung.com> on 2013-09-03
Reviewed by Chris Fleizach.

Sharing aria-sort.html specific mac test with efl and gtk.
Changing specific expectations of some accessibility tests.

  • accessibility/aria-sort-expected.txt: Renamed from LayoutTests/platform/mac/accessibility/aria-sort-expected.txt.
  • accessibility/aria-sort.html: Renamed from LayoutTests/platform/mac/accessibility/aria-sort.html.
  • platform/efl-wk2/TestExpectations:
  • platform/efl-wk2/accessibility/image-link-expected.txt:
  • platform/efl-wk2/accessibility/image-map2-expected.txt:
  • platform/efl-wk2/accessibility/table-cell-spans-expected.txt:
  • platform/efl-wk2/accessibility/table-cells-expected.txt:
  • platform/gtk/accessibility/image-link-expected.txt:
  • platform/gtk/accessibility/image-map2-expected.txt:
  • platform/gtk/accessibility/table-cell-spans-expected.txt:
  • platform/gtk/accessibility/table-cells-expected.txt:
Location:
trunk
Files:
15 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r154973 r154976  
     12013-09-03  Krzysztof Czech  <k.czech@samsung.com>
     2
     3        [AX][ATK] Added support for sort and help attributes
     4        https://bugs.webkit.org/show_bug.cgi?id=120456
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Sharing aria-sort.html specific mac test with efl and gtk.
     9        Changing specific expectations of some accessibility tests.
     10
     11        * accessibility/aria-sort-expected.txt: Renamed from LayoutTests/platform/mac/accessibility/aria-sort-expected.txt.
     12        * accessibility/aria-sort.html: Renamed from LayoutTests/platform/mac/accessibility/aria-sort.html.
     13        * platform/efl-wk2/TestExpectations:
     14        * platform/efl-wk2/accessibility/image-link-expected.txt:
     15        * platform/efl-wk2/accessibility/image-map2-expected.txt:
     16        * platform/efl-wk2/accessibility/table-cell-spans-expected.txt:
     17        * platform/efl-wk2/accessibility/table-cells-expected.txt:
     18        * platform/gtk/accessibility/image-link-expected.txt:
     19        * platform/gtk/accessibility/image-map2-expected.txt:
     20        * platform/gtk/accessibility/table-cell-spans-expected.txt:
     21        * platform/gtk/accessibility/table-cells-expected.txt:
     22
    1232013-09-03  Mihnea Ovidenie  <mihnea@adobe.com>
    224
  • trunk/LayoutTests/accessibility/aria-sort.html

    r154975 r154976  
    22<html>
    33<head>
    4 <script src="../../../fast/js/resources/js-test-pre.js"></script>
     4<script src="../fast/js/resources/js-test-pre.js"></script>
    55</head>
    66<body id="body">
     
    3636</script>
    3737
    38 <script src="../../../fast/js/resources/js-test-post.js"></script>
     38<script src="../fast/js/resources/js-test-post.js"></script>
    3939</body>
    4040</html>
  • trunk/LayoutTests/platform/efl-wk2/TestExpectations

    r154093 r154976  
    218218# Missing EFL's accessibility functions
    219219webkit.org/b/112027 accessibility/aria-describedby-on-input.html [ Failure ]
    220 webkit.org/b/112028 accessibility/aria-help.html [ Failure ]
    221220webkit.org/b/111984 accessibility/aria-hidden-updates-alldescendants.html [ Failure ]
    222221webkit.org/b/111986 accessibility/aria-invalid.html [ Failure ]
  • trunk/LayoutTests/platform/efl-wk2/accessibility/image-link-expected.txt

    r154680 r154976  
    2121AXRequired: 0
    2222AXChecked: 0
    23 AXPlatformAttributes: html-id:test, toolkit:WebKitEfl
     23AXPlatformAttributes: aria-sort:AXUnknownSortDirection, html-id:test, toolkit:WebKitEfl
    2424
    2525Child 0:
     
    4040AXRequired: 0
    4141AXChecked: 0
    42 AXPlatformAttributes: toolkit:WebKitEfl
     42AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    4343
    4444
  • trunk/LayoutTests/platform/efl-wk2/accessibility/image-map2-expected.txt

    r154680 r154976  
    1818AXRequired: 0
    1919AXChecked: 0
    20 AXPlatformAttributes: html-id:result, toolkit:WebKitEfl
     20AXPlatformAttributes: aria-sort:AXUnknownSortDirection, html-id:result, toolkit:WebKitEfl
    2121------------
    2222AXRole: AXLink
     
    3636AXRequired: 0
    3737AXChecked: 0
    38 AXPlatformAttributes: toolkit:WebKitEfl
     38AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    3939------------
    4040AXRole: AXLink
     
    5454AXRequired: 0
    5555AXChecked: 0
    56 AXPlatformAttributes: toolkit:WebKitEfl
     56AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    5757------------
    5858
  • trunk/LayoutTests/platform/efl-wk2/accessibility/table-cell-spans-expected.txt

    r154680 r154976  
    2626AXRequired: 0
    2727AXChecked: 0
    28 AXPlatformAttributes: toolkit:WebKitEfl
     28AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    2929{0, 2}, {0, 2}
    3030
     
    4848AXRequired: 0
    4949AXChecked: 0
    50 AXPlatformAttributes: toolkit:WebKitEfl
     50AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    5151{0, 2}, {0, 2}
    5252
     
    7070AXRequired: 0
    7171AXChecked: 0
    72 AXPlatformAttributes: toolkit:WebKitEfl
     72AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    7373{2, 2}, {0, 1}
    7474
     
    9292AXRequired: 0
    9393AXChecked: 0
    94 AXPlatformAttributes: toolkit:WebKitEfl
     94AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    9595{2, 2}, {0, 1}
    9696
     
    114114AXRequired: 0
    115115AXChecked: 0
    116 AXPlatformAttributes: toolkit:WebKitEfl
     116AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    117117{2, 1}, {3, 1}
    118118
  • trunk/LayoutTests/platform/efl-wk2/accessibility/table-cells-expected.txt

    r154680 r154976  
    2828AXRequired: 0
    2929AXChecked: 0
    30 AXPlatformAttributes: toolkit:WebKitEfl
     30AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    3131------------------------
    3232[3,1]
     
    4848AXRequired: 0
    4949AXChecked: 0
    50 AXPlatformAttributes: toolkit:WebKitEfl
     50AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    5151------------------------
    5252[1,1]
     
    6868AXRequired: 0
    6969AXChecked: 0
    70 AXPlatformAttributes: toolkit:WebKitEfl
     70AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    7171------------------------
    7272[2,2]
     
    8888AXRequired: 0
    8989AXChecked: 0
    90 AXPlatformAttributes: toolkit:WebKitEfl
     90AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    9191------------------------
    9292[3,5]
     
    108108AXRequired: 0
    109109AXChecked: 0
    110 AXPlatformAttributes: toolkit:WebKitEfl
     110AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitEfl
    111111------------------------
    112112[100,0]
  • trunk/LayoutTests/platform/gtk/accessibility/image-link-expected.txt

    r153432 r154976  
    2121AXRequired: 0
    2222AXChecked: 0
    23 AXPlatformAttributes: html-id:test, toolkit:WebKitGtk
     23AXPlatformAttributes: aria-sort:AXUnknownSortDirection, html-id:test, toolkit:WebKitGtk
    2424
    2525Child 0:
     
    4040AXRequired: 0
    4141AXChecked: 0
    42 AXPlatformAttributes: toolkit:WebKitGtk
     42AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    4343
    4444
  • trunk/LayoutTests/platform/gtk/accessibility/image-map2-expected.txt

    r153435 r154976  
    1818AXRequired: 0
    1919AXChecked: 0
    20 AXPlatformAttributes: html-id:result, toolkit:WebKitGtk
     20AXPlatformAttributes: aria-sort:AXUnknownSortDirection, html-id:result, toolkit:WebKitGtk
    2121------------
    2222AXRole: AXLink
     
    3636AXRequired: 0
    3737AXChecked: 0
    38 AXPlatformAttributes: toolkit:WebKitGtk
     38AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    3939------------
    4040AXRole: AXLink
     
    5454AXRequired: 0
    5555AXChecked: 0
    56 AXPlatformAttributes: toolkit:WebKitGtk
     56AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    5757------------
    5858
  • trunk/LayoutTests/platform/gtk/accessibility/table-cell-spans-expected.txt

    r153432 r154976  
    2626AXRequired: 0
    2727AXChecked: 0
    28 AXPlatformAttributes: toolkit:WebKitGtk
     28AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    2929{0, 2}, {0, 2}
    3030
     
    4848AXRequired: 0
    4949AXChecked: 0
    50 AXPlatformAttributes: toolkit:WebKitGtk
     50AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    5151{0, 2}, {0, 2}
    5252
     
    7070AXRequired: 0
    7171AXChecked: 0
    72 AXPlatformAttributes: toolkit:WebKitGtk
     72AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    7373{2, 2}, {0, 1}
    7474
     
    9292AXRequired: 0
    9393AXChecked: 0
    94 AXPlatformAttributes: toolkit:WebKitGtk
     94AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    9595{2, 2}, {0, 1}
    9696
     
    114114AXRequired: 0
    115115AXChecked: 0
    116 AXPlatformAttributes: toolkit:WebKitGtk
     116AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    117117{2, 1}, {3, 1}
    118118
  • trunk/LayoutTests/platform/gtk/accessibility/table-cells-expected.txt

    r153432 r154976  
    2828AXRequired: 0
    2929AXChecked: 0
    30 AXPlatformAttributes: toolkit:WebKitGtk
     30AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    3131------------------------
    3232[3,1]
     
    4848AXRequired: 0
    4949AXChecked: 0
    50 AXPlatformAttributes: toolkit:WebKitGtk
     50AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    5151------------------------
    5252[1,1]
     
    6868AXRequired: 0
    6969AXChecked: 0
    70 AXPlatformAttributes: toolkit:WebKitGtk
     70AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    7171------------------------
    7272[2,2]
     
    8888AXRequired: 0
    8989AXChecked: 0
    90 AXPlatformAttributes: toolkit:WebKitGtk
     90AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    9191------------------------
    9292[3,5]
     
    108108AXRequired: 0
    109109AXChecked: 0
    110 AXPlatformAttributes: toolkit:WebKitGtk
     110AXPlatformAttributes: aria-sort:AXUnknownSortDirection, toolkit:WebKitGtk
    111111------------------------
    112112[100,0]
  • trunk/Source/WebCore/ChangeLog

    r154975 r154976  
     12013-09-03  Krzysztof Czech  <k.czech@samsung.com>
     2
     3        [AX][ATK] Added support for sort and help attributes.
     4        https://bugs.webkit.org/show_bug.cgi?id=120456
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Added support for aria-sort and aria-help attributes.
     9
     10        Test: accessibility/aria-sort.html
     11
     12        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
     13        (webkitAccessibleGetAttributes):
     14
    1152013-09-03  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    216
  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp

    r154960 r154976  
    502502    if (!invalidStatus.isEmpty() && invalidStatus != "false")
    503503        attributeSet = addToAtkAttributeSet(attributeSet, "aria-invalid", coreObject->invalidStatus().string().utf8().data());
     504
     505    String helpText = coreObject->helpText();
     506    if (!helpText.isEmpty())
     507        attributeSet = addToAtkAttributeSet(attributeSet, "aria-help", helpText.utf8().data());
     508
     509    const char* sortDescription = "AXUnknownSortDirection";
     510    AccessibilitySortDirection sortDirection = coreObject->sortDirection();
     511    if (sortDirection == SortDirectionAscending)
     512        sortDescription = "AXAscendingSortDirection";
     513    else if (sortDirection == SortDirectionDescending)
     514        sortDescription = "AXDescendingSortDirection";
     515
     516    attributeSet = addToAtkAttributeSet(attributeSet, "aria-sort", sortDescription);
    504517
    505518    return attributeSet;
  • trunk/Tools/ChangeLog

    r154974 r154976  
     12013-09-03  Krzysztof Czech  <k.czech@samsung.com>
     2
     3        [AX][ATK] Added support for sort and help attributes
     4        https://bugs.webkit.org/show_bug.cgi?id=120456
     5
     6        Reviewed by Chris Fleizach.
     7
     8        Added missing implementation to AccessibilityUIElement::helpText and support for
     9        aria-sort attribute.
     10
     11        * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
     12        (coreAttributeToAtkAttribute):
     13        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
     14        (WTR::coreAttributeToAtkAttribute):
     15        (WTR::AccessibilityUIElement::helpText):
     16
    1172013-09-03  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    218
  • trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp

    r154960 r154976  
    5454    if (attributeString == "AXPlaceholderValue")
    5555        return "placeholder-text";
     56
     57    if (attributeString == "AXSortDirection")
     58        return "aria-sort";
    5659
    5760    return String();
  • trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp

    r154960 r154976  
    5858    if (attributeString == "AXPlaceholderValue")
    5959        return "placeholder-text";
     60   
     61    if (attributeString == "AXSortDirection")
     62        return "aria-sort";
    6063
    6164    return String();
     
    693696JSRetainPtr<JSStringRef> AccessibilityUIElement::helpText() const
    694697{
    695     // FIXME: implement
    696     // We need a way to call WebCore::AccessibilityObject::helpText()
    697     // from here, probably a new helper class in WebProcess/WebCoreSupport.
    698     return JSStringCreateWithCharacters(0, 0);
     698    if (!m_element || !ATK_IS_OBJECT(m_element.get()))
     699        return JSStringCreateWithCharacters(0, 0);
     700
     701    String attributeValue = getAttributeSetValueForId(ATK_OBJECT(m_element.get()), "aria-help");
     702    GOwnPtr<char> axValue(g_strdup_printf("AXHelp: %s", attributeValue.utf8().data()));
     703    return JSStringCreateWithUTF8CString(axValue.get());
    699704}
    700705
Note: See TracChangeset for help on using the changeset viewer.