Diff
Modified: trunk/LayoutTests/ChangeLog (160640 => 160641)
--- trunk/LayoutTests/ChangeLog 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/LayoutTests/ChangeLog 2013-12-16 16:18:30 UTC (rev 160641)
@@ -1,3 +1,15 @@
+2013-12-16 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [ATK] Expose accessibility objects for more WAI-ARIA roles
+ https://bugs.webkit.org/show_bug.cgi?id=125596
+
+ Reviewed by Chris Fleizach.
+
+ Update test to update expectations.
+
+ * platform/gtk/accessibility/roles-exposed-expected.txt:
+ * platform/gtk/accessibility/roles-exposed.html:
+
2013-12-16 Eric Carlson <eric.carl...@apple.com>
Fix QuickTime plug-in replacement scripting bugs
Modified: trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt (160640 => 160641)
--- trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2013-12-16 16:18:30 UTC (rev 160641)
@@ -126,6 +126,9 @@
PASS: input[type='week']
AXRole: AXTextField
+PASS: math
+ AXRole: AXMath
+
PASS: nav
AXRole: AXLandmarkNavigation
@@ -255,6 +258,12 @@
PASS: div[role=contentinfo]
AXRole: AXLandmarkContentInfo
+PASS: div[role=definition]
+ AXRole: AXDefinition
+
+PASS: div[role=dialog]
+ AXRole: AXDialog
+
PASS: div[role=directory]
AXRole: AXList
@@ -296,9 +305,18 @@
PASS: div[role=option]
AXRole: AXListItem
+PASS: div[role=log]
+ AXRole: AXLog
+
PASS: div[role=main]
AXRole: AXLandmarkMain
+PASS: div[role=marquee]
+ AXRole: AXMarquee
+
+PASS: div[role=math]
+ AXRole: AXMath
+
PASS: div[role=menu]
AXRole: AXMenu
@@ -326,6 +344,9 @@
PASS: div[role=navigation]
AXRole: AXLandmarkNavigation
+PASS: div[role=note]
+ AXRole: AXComment
+
PASS: div[role=progressbar]
AXRole: AXProgressIndicator
@@ -359,6 +380,9 @@
PASS: div[role=textbox]
AXRole: AXTextField
+PASS: div[role=timer]
+ AXRole: AXTimer
+
PASS: div[role=toolbar]
AXRole: AXToolbar
Modified: trunk/LayoutTests/platform/gtk/accessibility/roles-exposed.html (160640 => 160641)
--- trunk/LayoutTests/platform/gtk/accessibility/roles-exposed.html 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/LayoutTests/platform/gtk/accessibility/roles-exposed.html 2013-12-16 16:18:30 UTC (rev 160641)
@@ -1,4 +1,3 @@
-
<!DOCTYPE HTML>
<html>
<body>
@@ -90,7 +89,7 @@
<!-- skipped <link> -->
<!-- skipped <map> -->
<!-- skipped ATK: not focusable -- http://webkit.org/b/109018 <mark data-role="" class="ex">X</mark>-->
-<!-- http://webkit.org/b/125493 <math data-role="AXMath" class="ex">X</math>-->
+<math data-role="AXMath" class="ex">X</math>
<!-- skipped <menu> -->
<!-- skipped <meta> -->
<!-- http://webkit.org/b/125491 <meter data-role="AXProgressIndicator" class="ex" value="0.75">X</meter>-->
@@ -196,8 +195,8 @@
<div role="combobox" data-role="AXComboBox" class="ex">X</div>
<div role="complementary" data-role="AXLandmarkComplementary" class="ex">X</div>
<div role="contentinfo" data-role="AXLandmarkContentInfo" class="ex">X</div>
-<!-- http://webkit.org/b/125493 <div role="definition" data-role="AXDefinition" class="ex">X</div>-->
-<!-- http://webkit.org/b/125493 <div role="dialog" data-role="AXGroup" class="ex">X</div>-->
+<div role="definition" data-role="AXDefinition" class="ex">X</div>
+<div role="dialog" data-role="AXDialog" class="ex">X</div>
<div role="directory" data-role="AXList" class="ex">X</div>
<!-- http://webkit.org/b/125493 <div role="document" data-role="AXGroup" class="ex">X</div>-->
<!-- skipped ATK: wrong role <div role="form" data-role="AXForm" class="ex">X</div>-->
@@ -221,10 +220,10 @@
<div role="listbox" data-role="AXListBox" class="ex"><!-- http://webkit.org/b/125491 -->
<div role="option" data-role="AXListItem" class="ex">X</div>
</div>
-<!-- http://webkit.org/b/125493 <div role="log" data-role="AXLog" class="ex">X</div>-->
+<div role="log" data-role="AXLog" class="ex">X</div>
<div role="main" data-role="AXLandmarkMain" class="ex">X</div>
-<!-- http://webkit.org/b/125493 <div role="marquee" data-role="AXMarquee" class="ex">X</div>-->
-<!-- http://webkit.org/b/125493 <div role="math" data-role="AXMath" class="ex">X</div>-->
+<div role="marquee" data-role="AXMarquee" class="ex">X</div>
+<div role="math" data-role="AXMath" class="ex">X</div>
<div role="menu" data-role="AXMenu" class="ex">
<!-- Note: diff between menuitem types is an attribute; need additional non-role verification in another test. -->
<div role="menuitem" data-role="AXMenuItem" class="ex">X</div>
@@ -238,7 +237,7 @@
<div role="menuitemradio" data-role="AXRadioMenuItem" class="ex">X</div>
</div>
<div role="navigation" data-role="AXLandmarkNavigation" class="ex">X</div>
-<!-- http://webkit.org/b/125493 <div role="note" data-role="AXComment" class="ex">X</div>-->
+<div role="note" data-role="AXComment" class="ex">X</div>
<!-- skipped: presentation elements should not be exposed directly <div role="presentation" data-role="" class="ex">X</div>-->
<div role="progressbar" data-role="AXProgressIndicator" class="ex">X</div>
<div role="radiogroup" data-role="AXGroup" class="ex">
@@ -256,7 +255,7 @@
</div>
<!-- skipped ATK: wrong role <div role="tabpanel" data-role="AXGroup" panel" class="ex">X</div>-->
<div role="textbox" data-role="AXTextField" class="ex">X</div>
-<!-- http://webkit.org/b/125493 <div role="timer" data-role="AXTimer" class="ex">X</div>-->
+<div role="timer" data-role="AXTimer" class="ex">X</div>
<div role="toolbar" data-role="AXToolbar" class="ex">X</div>
<!-- http://webkit.org/b/125493 <div role="tooltip" data-role="AXGroup" class="ex">X</div>-->
<!-- http://webkit.org/b/125493 <div role="tree" data-role="AXOutline" class="ex">-->
Modified: trunk/Source/WebCore/ChangeLog (160640 => 160641)
--- trunk/Source/WebCore/ChangeLog 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/Source/WebCore/ChangeLog 2013-12-16 16:18:30 UTC (rev 160641)
@@ -1,3 +1,16 @@
+2013-12-16 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [ATK] Expose accessibility objects for more WAI-ARIA roles
+ https://bugs.webkit.org/show_bug.cgi?id=125596
+
+ Reviewed by Chris Fleizach.
+
+ Exposed accessibility objects with the proper AtkRoles, some of
+ them to be provided by the next stable release of ATK.
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (atkRole):
+
2013-12-16 Eric Carlson <eric.carl...@apple.com>
Fix QuickTime plug-in replacement scripting bugs
Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (160640 => 160641)
--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2013-12-16 16:18:30 UTC (rev 160641)
@@ -665,6 +665,8 @@
#endif
case DocumentRole:
return ATK_ROLE_DOCUMENT_FRAME;
+ case DocumentNoteRole:
+ return ATK_ROLE_COMMENT;
case HeadingRole:
return ATK_ROLE_HEADING;
case ListBoxRole:
@@ -696,6 +698,16 @@
case LandmarkApplicationRole:
return ATK_ROLE_EMBEDDED;
#if ATK_CHECK_VERSION(2, 11, 3)
+ case ApplicationLogRole:
+ return ATK_ROLE_LOG;
+ case ApplicationMarqueeRole:
+ return ATK_ROLE_MARQUEE;
+ case ApplicationTimerRole:
+ return ATK_ROLE_TIMER;
+ case DefinitionRole:
+ return ATK_ROLE_DEFINITION;
+ case DocumentMathRole:
+ return ATK_ROLE_MATH;
case LandmarkBannerRole:
case LandmarkComplementaryRole:
case LandmarkContentInfoRole:
Modified: trunk/Tools/ChangeLog (160640 => 160641)
--- trunk/Tools/ChangeLog 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/Tools/ChangeLog 2013-12-16 16:18:30 UTC (rev 160641)
@@ -1,5 +1,17 @@
2013-12-16 Mario Sanchez Prada <mario.pr...@samsung.com>
+ [ATK] Expose accessibility objects for more WAI-ARIA roles
+ https://bugs.webkit.org/show_bug.cgi?id=125596
+
+ Reviewed by Chris Fleizach.
+
+ Add mappings to DRT & WKTR for the newly exposed roles.
+
+ * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+
+2013-12-16 Mario Sanchez Prada <mario.pr...@samsung.com>
+
[ATK] Expose accessibility objects with ATK_ROLE_CHECK_MENU_ITEM
https://bugs.webkit.org/show_bug.cgi?id=125594
Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (160640 => 160641)
--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-12-16 16:18:30 UTC (rev 160641)
@@ -224,6 +224,8 @@
return "AXColumnHeader";
case ATK_ROLE_COMBO_BOX:
return "AXComboBox";
+ case ATK_ROLE_COMMENT:
+ return "AXComment";
case ATK_ROLE_DOCUMENT_FRAME:
return "AXDocument";
case ATK_ROLE_DOCUMENT_WEB:
@@ -327,6 +329,16 @@
#if ATK_CHECK_VERSION(2, 11, 3)
case ATK_ROLE_ARTICLE:
return "AXArticle";
+ case ATK_ROLE_DEFINITION:
+ return "AXDefinition";
+ case ATK_ROLE_LOG:
+ return "AXLog";
+ case ATK_ROLE_MARQUEE:
+ return "AXMarquee";
+ case ATK_ROLE_MATH:
+ return "AXMath";
+ case ATK_ROLE_TIMER:
+ return "AXTimer";
#endif
default:
// We want to distinguish ATK_ROLE_UNKNOWN from a known AtkRole which
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (160640 => 160641)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-12-16 16:04:50 UTC (rev 160640)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-12-16 16:18:30 UTC (rev 160641)
@@ -313,6 +313,8 @@
return "AXColumnHeader";
case ATK_ROLE_COMBO_BOX:
return "AXComboBox";
+ case ATK_ROLE_COMMENT:
+ return "AXComment";
case ATK_ROLE_DOCUMENT_FRAME:
return "AXDocument";
case ATK_ROLE_DOCUMENT_WEB:
@@ -416,6 +418,16 @@
#if ATK_CHECK_VERSION(2, 11, 3)
case ATK_ROLE_ARTICLE:
return "AXArticle";
+ case ATK_ROLE_DEFINITION:
+ return "AXDefinition";
+ case ATK_ROLE_LOG:
+ return "AXLog";
+ case ATK_ROLE_MARQUEE:
+ return "AXMarquee";
+ case ATK_ROLE_MATH:
+ return "AXMath";
+ case ATK_ROLE_TIMER:
+ return "AXTimer";
#endif
default:
// We want to distinguish ATK_ROLE_UNKNOWN from a known AtkRole which
