Changeset 193746 in webkit


Ignore:
Timestamp:
Dec 8, 2015 3:07:11 AM (8 years ago)
Author:
jdiggs@igalia.com
Message:

[GTK] 15 accessibility tests fail since r186692.
https://bugs.webkit.org/show_bug.cgi?id=148938

Reviewed by Mario Sanchez Prada.

Source/WebCore:

Failing tests rebaselined.

  • accessibility/atk/WebKitAccessibleWrapperAtk.cpp:

(atkRole): Treat GridCellRole and CellRole the same.
(roleIsTextType): Treat GridCellRole and CellRole the same.

LayoutTests:

  • platform/gtk/TestExpectations: Removed failing tests.
  • platform/gtk/accessibility/roles-computedRoleString-expected.txt: Rebaselined.
  • platform/gtk/accessibility/table-attributes-expected.txt: Rebaselined.
  • platform/gtk/accessibility/table-cell-spans-expected.txt: Rebaselined.
  • platform/gtk/accessibility/table-cells-expected.txt: Rebaselined.
  • platform/gtk/accessibility/table-detection-expected.txt: Rebaselined.
  • platform/gtk/accessibility/table-sections-expected.txt: Rebaselined.
  • platform/gtk/accessibility/table-with-rules-expected.txt: Rebaselined.
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r193743 r193746  
     12015-12-08  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        [GTK] 15 accessibility tests fail since r186692.
     4        https://bugs.webkit.org/show_bug.cgi?id=148938
     5
     6        Reviewed by Mario Sanchez Prada.
     7
     8        * platform/gtk/TestExpectations: Removed failing tests.
     9        * platform/gtk/accessibility/roles-computedRoleString-expected.txt: Rebaselined.
     10        * platform/gtk/accessibility/table-attributes-expected.txt: Rebaselined.
     11        * platform/gtk/accessibility/table-cell-spans-expected.txt: Rebaselined.
     12        * platform/gtk/accessibility/table-cells-expected.txt: Rebaselined.
     13        * platform/gtk/accessibility/table-detection-expected.txt: Rebaselined.
     14        * platform/gtk/accessibility/table-sections-expected.txt: Rebaselined.
     15        * platform/gtk/accessibility/table-with-rules-expected.txt: Rebaselined.
     16
    1172015-12-08  Frederic Wang  <fred.wang@free.fr>
    218
  • trunk/LayoutTests/platform/gtk/TestExpectations

    r192575 r193746  
    25212521imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded.htm [ Timeout ]
    25222522
    2523 webkit.org/b/148938 accessibility/aria-table-hierarchy.html [ Failure ]
    2524 webkit.org/b/148938 accessibility/aria-table-with-presentational-elements.html [ Failure ]
    2525 webkit.org/b/148938 accessibility/aria-tables.html [ Failure ]
    2526 webkit.org/b/148938 accessibility/poorly-formed-aria-table.html [ Failure ]
    2527 webkit.org/b/148938 accessibility/roles-computedRoleString.html [ Failure ]
    2528 webkit.org/b/148938 accessibility/roles-exposed.html [ Failure ]
    2529 webkit.org/b/148938 accessibility/table-attributes.html [ Failure ]
    2530 webkit.org/b/148938 accessibility/table-cell-spans.html [ Failure ]
    2531 webkit.org/b/148938 accessibility/table-cells.html [ Failure ]
    2532 webkit.org/b/148938 accessibility/table-detection.html [ Failure ]
    2533 webkit.org/b/148938 accessibility/table-fallback-roles-expose-element-attributes.html [ Failure ]
    2534 webkit.org/b/148938 accessibility/table-sections.html [ Failure ]
    2535 webkit.org/b/148938 accessibility/table-with-footer-section-above-body.html [ Failure ]
    2536 webkit.org/b/148938 accessibility/table-with-missing-aria-role-rows.html [ Failure ]
    2537 
    25382523webkit.org/b/151267 imported/blink/compositing/squashing/squashing-reflection-disallowed.html [ ImageOnlyFailure ]
    25392524webkit.org/b/151267 imported/blink/compositing/squashing/squash-overflow-hidden-contents.html [ ImageOnlyFailure ]
  • trunk/LayoutTests/platform/gtk/accessibility/roles-computedRoleString-expected.txt

    r189467 r193746  
    6060PASS: option -> option.
    6161PASS: option -> option.
    62 PASS: table -> grid.
     62PASS: table -> table.
    6363PASS: caption -> .
    6464PASS: tr -> row.
    6565PASS: th -> columnheader.
    6666PASS: tr -> row.
    67 PASS: td -> gridcell.
     67PASS: td -> cell.
    6868PASS: tr -> row.
    69 PASS: td -> gridcell.
     69PASS: td -> cell.
     70PASS: table[role="grid"] -> grid.
     71PASS: tr -> row.
     72PASS: th -> columnheader.
     73PASS: tr -> row.
     74PASS: td[role="gridcell"] -> gridcell.
     75PASS: tr -> row.
     76PASS: td[role="gridcell"] -> gridcell.
    7077PASS: textarea -> textbox.
    7178PASS: ul -> list.
  • trunk/LayoutTests/platform/gtk/accessibility/table-attributes-expected.txt

    r189467 r193746  
    1212AXParent: AXRow
    1313AXChildren: 0
    14 AXPosition: { 235.000000, 26.000000 }
    15 AXSize: { 144.000000, 63.000000 }
    16 AXTitle:
    17 AXDescription:
    18 AXValue: Ruritanian<\n>Population <\n>Survey
    19 AXFocusable: 0
    20 AXFocused: 0
    21 AXSelectable: 0
    22 AXSelected: 0
    23 AXMultiSelectable: 0
    24 AXEnabled: 1
    25 AXExpanded: 0
    26 AXRequired: 0
    27 AXChecked: 0
    28 AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk
    29 ------------
    30 AXRole: AXColumnHeader
    31 AXParent: AXRow
    32 AXChildren: 0
    33 AXPosition: { 235.000000, 26.000000 }
    34 AXSize: { 144.000000, 63.000000 }
    35 AXTitle:
    36 AXDescription:
    37 AXValue: Ruritanian<\n>Population <\n>Survey
    38 AXFocusable: 0
    39 AXFocused: 0
    40 AXSelectable: 0
    41 AXSelected: 0
    42 AXMultiSelectable: 0
    43 AXEnabled: 1
    44 AXExpanded: 0
    45 AXRequired: 0
    46 AXChecked: 0
    47 AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk
    48 ------------
    49 AXRole: AXColumnHeader
    50 AXParent: AXRow
    51 AXChildren: 0
    52 AXPosition: { 378.000000, 26.000000 }
    53 AXSize: { 70.000000, 63.000000 }
     14AXPosition: { 234.000000, 26.000000 }
     15AXSize: { 144.000000, 63.000000 }
     16AXTitle:
     17AXDescription:
     18AXValue: Ruritanian<\n>Population <\n>Survey
     19AXFocusable: 0
     20AXFocused: 0
     21AXSelectable: 0
     22AXSelected: 0
     23AXMultiSelectable: 0
     24AXEnabled: 1
     25AXExpanded: 0
     26AXRequired: 0
     27AXChecked: 0
     28AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk
     29------------
     30AXRole: AXColumnHeader
     31AXParent: AXRow
     32AXChildren: 0
     33AXPosition: { 234.000000, 26.000000 }
     34AXSize: { 144.000000, 63.000000 }
     35AXTitle:
     36AXDescription:
     37AXValue: Ruritanian<\n>Population <\n>Survey
     38AXFocusable: 0
     39AXFocused: 0
     40AXSelectable: 0
     41AXSelected: 0
     42AXMultiSelectable: 0
     43AXEnabled: 1
     44AXExpanded: 0
     45AXRequired: 0
     46AXChecked: 0
     47AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk
     48------------
     49AXRole: AXColumnHeader
     50AXParent: AXRow
     51AXChildren: 0
     52AXPosition: { 377.000000, 26.000000 }
     53AXSize: { 71.000000, 63.000000 }
    5454AXTitle:
    5555AXDescription:
     
    112112AXChildren: 0
    113113AXPosition: { 227.000000, 26.000000 }
    114 AXSize: { 143.000000, 63.000000 }
     114AXSize: { 144.000000, 63.000000 }
    115115AXTitle:
    116116AXDescription:
     
    131131AXChildren: 0
    132132AXPosition: { 227.000000, 26.000000 }
    133 AXSize: { 143.000000, 63.000000 }
     133AXSize: { 144.000000, 63.000000 }
    134134AXTitle:
    135135AXDescription:
     
    150150AXChildren: 0
    151151AXPosition: { 227.000000, 89.000000 }
    152 AXSize: { 90.000000, 58.000000 }
     152AXSize: { 91.000000, 58.000000 }
    153153AXTitle:
    154154AXDescription:
     
    169169AXChildren: 0
    170170AXPosition: { 227.000000, 89.000000 }
    171 AXSize: { 90.000000, 58.000000 }
     171AXSize: { 91.000000, 58.000000 }
    172172AXTitle:
    173173AXDescription:
     
    200200AXChildren: 0
    201201AXPosition: { 227.000000, 26.000000 }
    202 AXSize: { 143.000000, 63.000000 }
     202AXSize: { 144.000000, 63.000000 }
    203203AXTitle:
    204204AXDescription:
     
    219219AXChildren: 0
    220220AXPosition: { 227.000000, 26.000000 }
    221 AXSize: { 143.000000, 63.000000 }
     221AXSize: { 144.000000, 63.000000 }
    222222AXTitle:
    223223AXDescription:
     
    238238AXChildren: 0
    239239AXPosition: { 370.000000, 26.000000 }
    240 AXSize: { 69.000000, 63.000000 }
     240AXSize: { 70.000000, 63.000000 }
    241241AXTitle:
    242242AXDescription:
     
    295295AXChildren: 0
    296296AXPosition: { 227.000000, 26.000000 }
    297 AXSize: { 143.000000, 63.000000 }
     297AXSize: { 144.000000, 63.000000 }
    298298AXTitle:
    299299AXDescription:
     
    314314AXChildren: 0
    315315AXPosition: { 227.000000, 26.000000 }
    316 AXSize: { 143.000000, 63.000000 }
     316AXSize: { 144.000000, 63.000000 }
    317317AXTitle:
    318318AXDescription:
     
    333333AXChildren: 0
    334334AXPosition: { 370.000000, 26.000000 }
    335 AXSize: { 69.000000, 63.000000 }
     335AXSize: { 70.000000, 63.000000 }
    336336AXTitle:
    337337AXDescription:
     
    365365AXRequired: 0
    366366AXChecked: 0
    367 AXPlatformAttributes: computed-role:gridcell, tag:th, toolkit:WebKitGtk
     367AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk
    368368------------
    369369AXRole: AXCell
     
    371371AXChildren: 0
    372372AXPosition: { 491.000000, 55.000000 }
    373 AXSize: { 67.000000, 34.000000 }
     373AXSize: { 68.000000, 34.000000 }
    374374AXTitle:
    375375AXDescription:
     
    384384AXRequired: 0
    385385AXChecked: 0
    386 AXPlatformAttributes: computed-role:gridcell, tag:th, toolkit:WebKitGtk
     386AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk
    387387------------
    388388AXRole: AXRowHeader
     
    390390AXChildren: 0
    391391AXPosition: { 227.000000, 89.000000 }
    392 AXSize: { 90.000000, 58.000000 }
     392AXSize: { 91.000000, 58.000000 }
    393393AXTitle:
    394394AXDescription:
     
    409409AXChildren: 0
    410410AXPosition: { 317.000000, 89.000000 }
    411 AXSize: { 53.000000, 29.000000 }
     411AXSize: { 54.000000, 29.000000 }
    412412AXTitle:
    413413AXDescription:
     
    422422AXRequired: 0
    423423AXChecked: 0
    424 AXPlatformAttributes: computed-role:gridcell, tag:th, toolkit:WebKitGtk
     424AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk
    425425------------
    426426AXRole: AXCell
     
    428428AXChildren: 0
    429429AXPosition: { 370.000000, 89.000000 }
    430 AXSize: { 69.000000, 29.000000 }
     430AXSize: { 70.000000, 29.000000 }
    431431AXTitle:
    432432AXDescription:
     
    441441AXRequired: 0
    442442AXChecked: 0
    443 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     443AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    444444------------
    445445AXRole: AXCell
     
    460460AXRequired: 0
    461461AXChecked: 0
    462 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     462AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    463463------------
    464464AXRole: AXCell
     
    466466AXChildren: 0
    467467AXPosition: { 491.000000, 89.000000 }
    468 AXSize: { 67.000000, 29.000000 }
     468AXSize: { 68.000000, 29.000000 }
    469469AXTitle:
    470470AXDescription:
     
    479479AXRequired: 0
    480480AXChecked: 0
    481 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     481AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    482482------------
    483483AXRole: AXRowHeader
     
    485485AXChildren: 0
    486486AXPosition: { 227.000000, 89.000000 }
    487 AXSize: { 90.000000, 58.000000 }
     487AXSize: { 91.000000, 58.000000 }
    488488AXTitle:
    489489AXDescription:
     
    504504AXChildren: 0
    505505AXPosition: { 317.000000, 118.000000 }
    506 AXSize: { 53.000000, 29.000000 }
     506AXSize: { 54.000000, 29.000000 }
    507507AXTitle:
    508508AXDescription:
     
    517517AXRequired: 0
    518518AXChecked: 0
    519 AXPlatformAttributes: computed-role:gridcell, tag:th, toolkit:WebKitGtk
     519AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk
    520520------------
    521521AXRole: AXCell
     
    523523AXChildren: 0
    524524AXPosition: { 370.000000, 118.000000 }
    525 AXSize: { 69.000000, 29.000000 }
     525AXSize: { 70.000000, 29.000000 }
    526526AXTitle:
    527527AXDescription:
     
    536536AXRequired: 0
    537537AXChecked: 0
    538 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     538AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    539539------------
    540540AXRole: AXCell
     
    555555AXRequired: 0
    556556AXChecked: 0
    557 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     557AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    558558------------
    559559AXRole: AXCell
     
    561561AXChildren: 0
    562562AXPosition: { 491.000000, 118.000000 }
    563 AXSize: { 67.000000, 29.000000 }
     563AXSize: { 68.000000, 29.000000 }
    564564AXTitle:
    565565AXDescription:
     
    574574AXRequired: 0
    575575AXChecked: 0
    576 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
    577 ------------
    578 
    579 
    580 --------------------------
    581 
    582 
    583 
    584 --------------------------
    585 
    586 
     576AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
     577------------
     578
     579
     580--------------------------
     581
     582
     583
     584--------------------------
     585
     586
  • trunk/LayoutTests/platform/gtk/accessibility/table-cell-spans-expected.txt

    r189467 r193746  
    1313AXChildren: 0
    1414AXPosition: { 154.000000, 9.000000 }
    15 AXSize: { 246.000000, 75.000000 }
     15AXSize: { 247.000000, 75.000000 }
    1616AXTitle:
    1717AXDescription:
     
    2626AXRequired: 0
    2727AXChecked: 0
    28 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     28AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    2929{0, 2}, {0, 2}
    3030
     
    3535AXChildren: 0
    3636AXPosition: { 154.000000, 9.000000 }
    37 AXSize: { 246.000000, 75.000000 }
     37AXSize: { 247.000000, 75.000000 }
    3838AXTitle:
    3939AXDescription:
     
    4848AXRequired: 0
    4949AXChecked: 0
    50 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     50AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    5151{0, 2}, {0, 2}
    5252
     
    5656AXParent: AXRow
    5757AXChildren: 0
    58 AXPosition: { 147.000000, 84.000000 }
     58AXPosition: { 146.000000, 84.000000 }
    5959AXSize: { 124.000000, 58.000000 }
    6060AXTitle:
     
    7070AXRequired: 0
    7171AXChecked: 0
    72 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     72AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    7373{2, 2}, {0, 1}
    7474
     
    7878AXParent: AXRow
    7979AXChildren: 0
    80 AXPosition: { 147.000000, 84.000000 }
     80AXPosition: { 146.000000, 84.000000 }
    8181AXSize: { 124.000000, 58.000000 }
    8282AXTitle:
     
    9292AXRequired: 0
    9393AXChecked: 0
    94 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     94AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    9595{2, 2}, {0, 1}
    9696
     
    114114AXRequired: 0
    115115AXChecked: 0
    116 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     116AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    117117{2, 1}, {3, 1}
    118118
  • trunk/LayoutTests/platform/gtk/accessibility/table-cells-expected.txt

    r189467 r193746  
    1414AXParent: AXRow
    1515AXChildren: 0
    16 AXPosition: { 235.000000, 26.000000 }
     16AXPosition: { 234.000000, 26.000000 }
    1717AXSize: { 144.000000, 63.000000 }
    1818AXTitle:
     
    4848AXRequired: 0
    4949AXChecked: 0
    50 AXPlatformAttributes: computed-role:gridcell, tag:th, toolkit:WebKitGtk
     50AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk
    5151------------------------
    5252[1,1]
     
    5555AXChildren: 0
    5656AXPosition: { 227.000000, 26.000000 }
    57 AXSize: { 143.000000, 63.000000 }
     57AXSize: { 144.000000, 63.000000 }
    5858AXTitle:
    5959AXDescription:
     
    7575AXChildren: 0
    7676AXPosition: { 370.000000, 89.000000 }
    77 AXSize: { 69.000000, 29.000000 }
     77AXSize: { 70.000000, 29.000000 }
    7878AXTitle:
    7979AXDescription:
     
    8888AXRequired: 0
    8989AXChecked: 0
    90 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     90AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    9191------------------------
    9292[3,5]
     
    108108AXRequired: 0
    109109AXChecked: 0
    110 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     110AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    111111------------------------
    112112[100,0]
  • trunk/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt

    r189467 r193746  
    1818AXRequired: 0
    1919AXChecked: 0
    20 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     20AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    2121
    2222asdf    asdf
     
    4141AXRequired: 0
    4242AXChecked: 0
    43 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     43AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    4444
    4545asdf    asdf
     
    8686AXRequired: 0
    8787AXChecked: 0
    88 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     88AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    8989
    9090asdf    asdf
     
    108108AXRequired: 0
    109109AXChecked: 0
    110 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     110AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    111111
    112112asdf    asdf
     
    130130AXRequired: 0
    131131AXChecked: 0
    132 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     132AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    133133
    134134asdf    asdf
     
    153153AXRequired: 0
    154154AXChecked: 0
    155 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     155AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    156156
    157157asdf    asdf
     
    221221AXRequired: 0
    222222AXChecked: 0
    223 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     223AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    224224
    225225asdf    asdf
     
    231231AXChildren: 0
    232232AXPosition: { 8.000000, 346.000000 }
    233 AXSize: { 769.000000, 27.000000 }
     233AXSize: { 770.000000, 27.000000 }
    234234AXTitle:
    235235AXDescription:
     
    295295AXRequired: 0
    296296AXChecked: 0
    297 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     297AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    298298
    299299asdf    asdf
     
    317317AXRequired: 0
    318318AXChecked: 0
    319 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     319AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    320320
    321321asdf    asdf
     
    364364AXRequired: 0
    365365AXChecked: 0
    366 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     366AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    367367
    368368asdf    asdf
     
    388388AXRequired: 0
    389389AXChecked: 0
    390 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     390AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    391391
    392392asdf    asdf
     
    412412AXRequired: 0
    413413AXChecked: 0
    414 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     414AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    415415
    416416asdf    asdf
     
    435435AXRequired: 0
    436436AXChecked: 0
    437 AXPlatformAttributes: computed-role:grid, tag:table, toolkit:WebKitGtk
     437AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk
    438438
    439439asdf
     
    480480AXRequired: 0
    481481AXChecked: 0
    482 AXPlatformAttributes: computed-role:grid, toolkit:WebKitGtk
     482AXPlatformAttributes: computed-role:table, toolkit:WebKitGtk
    483483
    484484head    head2
  • trunk/LayoutTests/platform/gtk/accessibility/table-sections-expected.txt

    r189467 r193746  
    2121AXParent: AXRow
    2222AXChildren: 0
    23 AXPosition: { 363.000000, 60.000000 }
    24 AXSize: { 21.000000, 29.000000 }
    25 AXTitle:
    26 AXDescription:
    27 AXValue: 1
    28 AXFocusable: 0
    29 AXFocused: 0
    30 AXSelectable: 0
    31 AXSelected: 0
    32 AXMultiSelectable: 0
    33 AXEnabled: 1
    34 AXExpanded: 0
    35 AXRequired: 0
    36 AXChecked: 0
    37 AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk
    38 ------------
    39 AXRole: AXColumnHeader
    40 AXParent: AXRow
    41 AXChildren: 0
    42 AXPosition: { 383.000000, 60.000000 }
    43 AXSize: { 28.000000, 29.000000 }
     23AXPosition: { 362.000000, 60.000000 }
     24AXSize: { 21.000000, 29.000000 }
     25AXTitle:
     26AXDescription:
     27AXValue: 1
     28AXFocusable: 0
     29AXFocused: 0
     30AXSelectable: 0
     31AXSelected: 0
     32AXMultiSelectable: 0
     33AXEnabled: 1
     34AXExpanded: 0
     35AXRequired: 0
     36AXChecked: 0
     37AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk
     38------------
     39AXRole: AXColumnHeader
     40AXParent: AXRow
     41AXChildren: 0
     42AXPosition: { 382.000000, 60.000000 }
     43AXSize: { 29.000000, 29.000000 }
    4444AXTitle:
    4545AXDescription:
     
    7373AXRequired: 0
    7474AXChecked: 0
    75 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     75AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    7676------------
    7777
     
    8383AXChildren: 0
    8484AXPosition: { 355.000000, 60.000000 }
    85 AXSize: { 20.000000, 29.000000 }
     85AXSize: { 21.000000, 29.000000 }
    8686AXTitle:
    8787AXDescription:
     
    102102AXChildren: 0
    103103AXPosition: { 355.000000, 89.000000 }
    104 AXSize: { 20.000000, 29.000000 }
     104AXSize: { 21.000000, 29.000000 }
    105105AXTitle:
    106106AXDescription:
     
    121121AXChildren: 0
    122122AXPosition: { 355.000000, 118.000000 }
    123 AXSize: { 20.000000, 29.000000 }
     123AXSize: { 21.000000, 29.000000 }
    124124AXTitle:
    125125AXDescription:
     
    168168AXChildren: 0
    169169AXPosition: { 355.000000, 60.000000 }
    170 AXSize: { 20.000000, 29.000000 }
     170AXSize: { 21.000000, 29.000000 }
    171171AXTitle:
    172172AXDescription:
     
    187187AXChildren: 0
    188188AXPosition: { 375.000000, 60.000000 }
    189 AXSize: { 27.000000, 29.000000 }
     189AXSize: { 28.000000, 29.000000 }
    190190AXTitle:
    191191AXDescription:
     
    219219AXRequired: 0
    220220AXChecked: 0
    221 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     221AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    222222------------
    223223AXRole: AXRowHeader
     
    225225AXChildren: 0
    226226AXPosition: { 355.000000, 89.000000 }
    227 AXSize: { 20.000000, 29.000000 }
     227AXSize: { 21.000000, 29.000000 }
    228228AXTitle:
    229229AXDescription:
     
    244244AXChildren: 0
    245245AXPosition: { 375.000000, 89.000000 }
    246 AXSize: { 27.000000, 29.000000 }
     246AXSize: { 28.000000, 29.000000 }
    247247AXTitle:
    248248AXDescription:
     
    257257AXRequired: 0
    258258AXChecked: 0
    259 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     259AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    260260------------
    261261AXRole: AXCell
     
    276276AXRequired: 0
    277277AXChecked: 0
    278 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     278AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    279279------------
    280280AXRole: AXRowHeader
     
    282282AXChildren: 0
    283283AXPosition: { 355.000000, 118.000000 }
    284 AXSize: { 20.000000, 29.000000 }
     284AXSize: { 21.000000, 29.000000 }
    285285AXTitle:
    286286AXDescription:
     
    301301AXChildren: 0
    302302AXPosition: { 375.000000, 118.000000 }
    303 AXSize: { 27.000000, 29.000000 }
     303AXSize: { 28.000000, 29.000000 }
    304304AXTitle:
    305305AXDescription:
     
    314314AXRequired: 0
    315315AXChecked: 0
    316 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     316AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    317317------------
    318318AXRole: AXCell
     
    333333AXRequired: 0
    334334AXChecked: 0
    335 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     335AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    336336------------
    337337AXRole: AXCell
     
    339339AXChildren: 0
    340340AXPosition: { 355.000000, 147.000000 }
    341 AXSize: { 20.000000, 29.000000 }
    342 AXTitle:
    343 AXDescription:
    344 AXValue: 1
    345 AXFocusable: 0
    346 AXFocused: 0
    347 AXSelectable: 1
    348 AXSelected: 0
    349 AXMultiSelectable: 0
    350 AXEnabled: 1
    351 AXExpanded: 0
    352 AXRequired: 0
    353 AXChecked: 0
    354 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     341AXSize: { 21.000000, 29.000000 }
     342AXTitle:
     343AXDescription:
     344AXValue: 1
     345AXFocusable: 0
     346AXFocused: 0
     347AXSelectable: 1
     348AXSelected: 0
     349AXMultiSelectable: 0
     350AXEnabled: 1
     351AXExpanded: 0
     352AXRequired: 0
     353AXChecked: 0
     354AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    355355------------
    356356AXRole: AXCell
     
    358358AXChildren: 0
    359359AXPosition: { 375.000000, 147.000000 }
    360 AXSize: { 27.000000, 29.000000 }
     360AXSize: { 28.000000, 29.000000 }
    361361AXTitle:
    362362AXDescription:
     
    371371AXRequired: 0
    372372AXChecked: 0
    373 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     373AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    374374------------
    375375AXRole: AXCell
     
    390390AXRequired: 0
    391391AXChecked: 0
    392 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     392AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    393393------------
    394394
     
    408408AXChildren: 0
    409409AXPosition: { 355.000000, 60.000000 }
    410 AXSize: { 20.000000, 29.000000 }
     410AXSize: { 21.000000, 29.000000 }
    411411AXTitle:
    412412AXDescription:
     
    427427AXChildren: 0
    428428AXPosition: { 375.000000, 60.000000 }
    429 AXSize: { 27.000000, 29.000000 }
     429AXSize: { 28.000000, 29.000000 }
    430430AXTitle:
    431431AXDescription:
     
    459459AXRequired: 0
    460460AXChecked: 0
    461 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     461AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    462462------------
    463463
     
    469469AXChildren: 0
    470470AXPosition: { 355.000000, 60.000000 }
    471 AXSize: { 20.000000, 29.000000 }
     471AXSize: { 21.000000, 29.000000 }
    472472AXTitle:
    473473AXDescription:
     
    488488AXChildren: 0
    489489AXPosition: { 355.000000, 89.000000 }
    490 AXSize: { 20.000000, 29.000000 }
     490AXSize: { 21.000000, 29.000000 }
    491491AXTitle:
    492492AXDescription:
     
    507507AXChildren: 0
    508508AXPosition: { 355.000000, 118.000000 }
    509 AXSize: { 20.000000, 29.000000 }
     509AXSize: { 21.000000, 29.000000 }
    510510AXTitle:
    511511AXDescription:
     
    554554AXChildren: 0
    555555AXPosition: { 355.000000, 60.000000 }
    556 AXSize: { 20.000000, 29.000000 }
     556AXSize: { 21.000000, 29.000000 }
    557557AXTitle:
    558558AXDescription:
     
    573573AXChildren: 0
    574574AXPosition: { 375.000000, 60.000000 }
    575 AXSize: { 27.000000, 29.000000 }
     575AXSize: { 28.000000, 29.000000 }
    576576AXTitle:
    577577AXDescription:
     
    605605AXRequired: 0
    606606AXChecked: 0
    607 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     607AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    608608------------
    609609AXRole: AXRowHeader
     
    611611AXChildren: 0
    612612AXPosition: { 355.000000, 89.000000 }
    613 AXSize: { 20.000000, 29.000000 }
     613AXSize: { 21.000000, 29.000000 }
    614614AXTitle:
    615615AXDescription:
     
    630630AXChildren: 0
    631631AXPosition: { 375.000000, 89.000000 }
    632 AXSize: { 27.000000, 29.000000 }
     632AXSize: { 28.000000, 29.000000 }
    633633AXTitle:
    634634AXDescription:
     
    643643AXRequired: 0
    644644AXChecked: 0
    645 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     645AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    646646------------
    647647AXRole: AXCell
     
    662662AXRequired: 0
    663663AXChecked: 0
    664 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     664AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    665665------------
    666666AXRole: AXRowHeader
     
    668668AXChildren: 0
    669669AXPosition: { 355.000000, 118.000000 }
    670 AXSize: { 20.000000, 29.000000 }
     670AXSize: { 21.000000, 29.000000 }
    671671AXTitle:
    672672AXDescription:
     
    687687AXChildren: 0
    688688AXPosition: { 375.000000, 118.000000 }
    689 AXSize: { 27.000000, 29.000000 }
     689AXSize: { 28.000000, 29.000000 }
    690690AXTitle:
    691691AXDescription:
     
    700700AXRequired: 0
    701701AXChecked: 0
    702 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     702AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    703703------------
    704704AXRole: AXCell
     
    719719AXRequired: 0
    720720AXChecked: 0
    721 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     721AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    722722------------
    723723AXRole: AXCell
     
    725725AXChildren: 0
    726726AXPosition: { 355.000000, 147.000000 }
    727 AXSize: { 20.000000, 29.000000 }
    728 AXTitle:
    729 AXDescription:
    730 AXValue: 1
    731 AXFocusable: 0
    732 AXFocused: 0
    733 AXSelectable: 1
    734 AXSelected: 0
    735 AXMultiSelectable: 0
    736 AXEnabled: 1
    737 AXExpanded: 0
    738 AXRequired: 0
    739 AXChecked: 0
    740 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     727AXSize: { 21.000000, 29.000000 }
     728AXTitle:
     729AXDescription:
     730AXValue: 1
     731AXFocusable: 0
     732AXFocused: 0
     733AXSelectable: 1
     734AXSelected: 0
     735AXMultiSelectable: 0
     736AXEnabled: 1
     737AXExpanded: 0
     738AXRequired: 0
     739AXChecked: 0
     740AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    741741------------
    742742AXRole: AXCell
     
    744744AXChildren: 0
    745745AXPosition: { 375.000000, 147.000000 }
    746 AXSize: { 27.000000, 29.000000 }
     746AXSize: { 28.000000, 29.000000 }
    747747AXTitle:
    748748AXDescription:
     
    757757AXRequired: 0
    758758AXChecked: 0
    759 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
     759AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
    760760------------
    761761AXRole: AXCell
     
    776776AXRequired: 0
    777777AXChecked: 0
    778 AXPlatformAttributes: computed-role:gridcell, tag:td, toolkit:WebKitGtk
    779 ------------
    780 
    781 
    782 --------------------------
    783 
    784 
    785 
    786 --------------------------
    787 
    788 
     778AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk
     779------------
     780
     781
     782--------------------------
     783
     784
     785
     786--------------------------
     787
     788
  • trunk/LayoutTests/platform/gtk/accessibility/table-with-rules-expected.txt

    r189467 r193746  
    2222AXRequired: 0
    2323AXChecked: 0
    24 AXPlatformAttributes: computed-role:grid, html-id:testTable2, tag:table, toolkit:WebKitGtk
     24AXPlatformAttributes: computed-role:table, html-id:testTable2, tag:table, toolkit:WebKitGtk
    2525
    2626AXRole: AXTable
     
    4040AXRequired: 0
    4141AXChecked: 0
    42 AXPlatformAttributes: computed-role:grid, html-id:testTable3, tag:table, toolkit:WebKitGtk
     42AXPlatformAttributes: computed-role:table, html-id:testTable3, tag:table, toolkit:WebKitGtk
    4343
    4444AXRole: AXTable
     
    5858AXRequired: 0
    5959AXChecked: 0
    60 AXPlatformAttributes: computed-role:grid, html-id:testTable4, tag:table, toolkit:WebKitGtk
     60AXPlatformAttributes: computed-role:table, html-id:testTable4, tag:table, toolkit:WebKitGtk
    6161
    6262AXRole: AXSection
     
    8383AXChildren: 0
    8484AXPosition: { 40.000000, 90.000000 }
    85 AXSize: { 28.000000, 19.000000 }
     85AXSize: { 29.000000, 19.000000 }
    8686AXTitle:
    8787AXDescription:
  • trunk/Source/WebCore/ChangeLog

    r193743 r193746  
     12015-12-08  Joanmarie Diggs  <jdiggs@igalia.com>
     2
     3        [GTK] 15 accessibility tests fail since r186692.
     4        https://bugs.webkit.org/show_bug.cgi?id=148938
     5
     6        Reviewed by Mario Sanchez Prada.
     7
     8        Failing tests rebaselined.
     9
     10        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
     11        (atkRole): Treat GridCellRole and CellRole the same.
     12        (roleIsTextType): Treat GridCellRole and CellRole the same.
     13
    1142015-12-08  Frederic Wang  <fred.wang@free.fr>
    215
  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp

    r185662 r193746  
    565565    case ScrollAreaRole:
    566566        return ATK_ROLE_SCROLL_PANE;
    567     case GridRole: // Is this right?
     567    case GridRole:
    568568    case TableRole:
    569569        return ATK_ROLE_TABLE;
     
    582582        return ATK_ROLE_CAPTION;
    583583    case CellRole:
     584    case GridCellRole:
    584585        return coreObject->inheritsPresentationalRole() ? ATK_ROLE_SECTION : ATK_ROLE_TABLE_CELL;
    585586    case LinkRole:
     
    10671068{
    10681069    return role == ParagraphRole || role == HeadingRole || role == DivRole || role == CellRole
    1069         || role == LinkRole || role == WebCoreLinkRole || role == ListItemRole || role == PreRole;
     1070        || role == LinkRole || role == WebCoreLinkRole || role == ListItemRole || role == PreRole
     1071        || role == GridCellRole;
    10701072}
    10711073
Note: See TracChangeset for help on using the changeset viewer.