Diff
Modified: trunk/LayoutTests/ChangeLog (160711 => 160712)
--- trunk/LayoutTests/ChangeLog 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/LayoutTests/ChangeLog 2013-12-17 18:08:34 UTC (rev 160712)
@@ -1,3 +1,22 @@
+2013-12-17 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [ATK] Expose accessibility objects for <dl>, <dt> and <dd>
+ https://bugs.webkit.org/show_bug.cgi?id=125857
+
+ Reviewed by Chris Fleizach.
+
+ Update test to update expectations.
+
+ * platform/gtk/accessibility/roles-exposed-expected.txt:
+ * platform/gtk/accessibility/roles-exposed.html:
+
+ Updated test expectations for other test using description lists.
+
+ * platform/efl-wk1/accessibility/lists-expected.txt:
+ * platform/efl-wk2/accessibility/lists-expected.txt:
+ * platform/gtk/accessibility/lists-expected.txt:
+
+
2013-12-17 Frédéric Wang <fred.w...@free.fr>
Ensure inferred mrows for msqrt, mstyle, merror, mphantom and math.
Modified: trunk/LayoutTests/platform/efl-wk1/accessibility/lists-expected.txt (160711 => 160712)
--- trunk/LayoutTests/platform/efl-wk1/accessibility/lists-expected.txt 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/LayoutTests/platform/efl-wk1/accessibility/lists-expected.txt 2013-12-17 18:08:34 UTC (rev 160712)
@@ -47,7 +47,7 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXList
+AXRole: AXDescriptionList
AXParent: AXWebArea
AXChildren: 5
AXPosition: { 8.000000, 120.000000 }
@@ -204,8 +204,8 @@
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionTerm
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 8.000000, 120.000000 }
AXSize: { 769.000000, 18.000000 }
@@ -223,8 +223,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 48.000000, 138.000000 }
AXSize: { 729.000000, 18.000000 }
@@ -242,8 +242,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionTerm
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 8.000000, 156.000000 }
AXSize: { 769.000000, 18.000000 }
@@ -261,8 +261,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 48.000000, 174.000000 }
AXSize: { 729.000000, 18.000000 }
@@ -280,8 +280,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 48.000000, 192.000000 }
AXSize: { 729.000000, 18.000000 }
Modified: trunk/LayoutTests/platform/efl-wk2/accessibility/lists-expected.txt (160711 => 160712)
--- trunk/LayoutTests/platform/efl-wk2/accessibility/lists-expected.txt 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/LayoutTests/platform/efl-wk2/accessibility/lists-expected.txt 2013-12-17 18:08:34 UTC (rev 160712)
@@ -47,7 +47,7 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXList
+AXRole: AXDescriptionList
AXParent: AXWebArea
AXChildren: 5
AXPosition: { 0.000000, 0.000000 }
@@ -204,8 +204,8 @@
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionTerm
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 0.000000, 0.000000 }
AXSize: { 769.000000, 18.000000 }
@@ -223,8 +223,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 0.000000, 0.000000 }
AXSize: { 729.000000, 18.000000 }
@@ -242,8 +242,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionTerm
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 0.000000, 0.000000 }
AXSize: { 769.000000, 18.000000 }
@@ -261,8 +261,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 0.000000, 0.000000 }
AXSize: { 729.000000, 18.000000 }
@@ -280,8 +280,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitEfl
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 0.000000, 0.000000 }
AXSize: { 729.000000, 18.000000 }
Modified: trunk/LayoutTests/platform/gtk/accessibility/lists-expected.txt (160711 => 160712)
--- trunk/LayoutTests/platform/gtk/accessibility/lists-expected.txt 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/LayoutTests/platform/gtk/accessibility/lists-expected.txt 2013-12-17 18:08:34 UTC (rev 160712)
@@ -47,7 +47,7 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitGtk
------------
-AXRole: AXList
+AXRole: AXDescriptionList
AXParent: AXWebArea
AXChildren: 5
AXPosition: { 8.000000, 116.000000 }
@@ -204,8 +204,8 @@
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionTerm
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 8.000000, 116.000000 }
AXSize: { 769.000000, 17.000000 }
@@ -223,8 +223,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitGtk
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 48.000000, 133.000000 }
AXSize: { 729.000000, 17.000000 }
@@ -242,8 +242,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitGtk
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionTerm
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 8.000000, 150.000000 }
AXSize: { 769.000000, 17.000000 }
@@ -261,8 +261,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitGtk
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 48.000000, 167.000000 }
AXSize: { 729.000000, 17.000000 }
@@ -280,8 +280,8 @@
AXChecked: 0
AXPlatformAttributes: toolkit:WebKitGtk
------------
-AXRole: AXUnknown
-AXParent: AXList
+AXRole: AXDescriptionValue
+AXParent: AXDescriptionList
AXChildren: 0
AXPosition: { 48.000000, 184.000000 }
AXSize: { 729.000000, 17.000000 }
Modified: trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt (160711 => 160712)
--- trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2013-12-17 18:08:34 UTC (rev 160712)
@@ -21,6 +21,15 @@
PASS: button
AXRole: AXButton
+PASS: dl
+ AXRole: AXDescriptionList
+
+PASS: dt
+ AXRole: AXDescriptionTerm
+
+PASS: dd
+ AXRole: AXDescriptionValue
+
PASS: div
AXRole: AXSection
Modified: trunk/LayoutTests/platform/gtk/accessibility/roles-exposed.html (160711 => 160712)
--- trunk/LayoutTests/platform/gtk/accessibility/roles-exposed.html 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/LayoutTests/platform/gtk/accessibility/roles-exposed.html 2013-12-17 18:08:34 UTC (rev 160712)
@@ -26,10 +26,10 @@
<!-- skipped ATK: not focusable <del data-role="" class="ex">X</del>-->
<!-- skipped <details/summary> http://webkit.org/b/108979 -->
<!-- skipped <dfn data-role="AXGroup" class="ex">X</dfn> -->
-<!-- http://webkit.org/b/125493 <dl data-role="AXDefinitionList" list" class="ex">-->
- <!-- http://webkit.org/b/125493 <dt data-role="AXGroup" class="ex">X</dt> -->
- <!-- http://webkit.org/b/125493 <dd data-role="AXGroup" class="ex">X</dd> -->
-<!-- </dl> -->
+<dl data-role="AXDescriptionList" class="ex">
+ <dt data-role="AXDescriptionTerm" class="ex">X</dt>
+ <dd data-role="AXDescriptionValue" class="ex">X</dd>
+</dl>
<div data-role="AXSection" class="ex">X</div>
<!-- skipped ATK: not focusable <em data-role="" class="ex">X</em>-->
<!-- skipped <embed> -->
Modified: trunk/Source/WebCore/ChangeLog (160711 => 160712)
--- trunk/Source/WebCore/ChangeLog 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/Source/WebCore/ChangeLog 2013-12-17 18:08:34 UTC (rev 160712)
@@ -1,3 +1,19 @@
+2013-12-17 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [ATK] Expose accessibility objects for <dl>, <dt> and <dd>
+ https://bugs.webkit.org/show_bug.cgi?id=125857
+
+ Reviewed by Chris Fleizach.
+
+ Map description lists to the newly introduced ATK roles
+ ATK_ROLE_DESCRIPTION_LIST, ATK_ROLE_DESCRIPTION_TERM and
+ ATK_ROLE_DESCRIPTION_VALUE, introduced in ATK 2.11.4.
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (atkRole): Do the right mapping.
+ (webkitAccessibleGetRole): Update call to atkRole, now that it
+ receives an AccessibilityObject* as parameter.
+
2013-12-17 Frédéric Wang <fred.w...@free.fr>
Ensure inferred mrows for msqrt, mstyle, merror, mphantom and math.
Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (160711 => 160712)
--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2013-12-17 18:08:34 UTC (rev 160712)
@@ -35,6 +35,7 @@
#if HAVE(ACCESSIBILITY)
#include "AXObjectCache.h"
+#include "AccessibilityList.h"
#include "AccessibilityListBoxOption.h"
#include "Document.h"
#include "Frame.h"
@@ -557,8 +558,9 @@
return attributeSet;
}
-static AtkRole atkRole(AccessibilityRole role)
+static AtkRole atkRole(AccessibilityObject* coreObject)
{
+ AccessibilityRole role = coreObject->roleValue();
switch (role) {
case ApplicationAlertDialogRole:
case ApplicationAlertRole:
@@ -632,6 +634,10 @@
case ColorWellRole:
return ATK_ROLE_COLOR_CHOOSER;
case ListRole:
+#if ATK_CHECK_VERSION(2, 11, 4)
+ if (coreObject->isList() && toAccessibilityList(coreObject)->isDescriptionList())
+ return ATK_ROLE_DESCRIPTION_LIST;
+#endif
return ATK_ROLE_LIST;
case ScrollBarRole:
return ATK_ROLE_SCROLL_BAR;
@@ -716,6 +722,14 @@
case LandmarkSearchRole:
return ATK_ROLE_LANDMARK;
#endif
+#if ATK_CHECK_VERSION(2, 11, 4)
+ case DescriptionListRole:
+ return ATK_ROLE_DESCRIPTION_LIST;
+ case DescriptionListTermRole:
+ return ATK_ROLE_DESCRIPTION_TERM;
+ case DescriptionListDetailRole:
+ return ATK_ROLE_DESCRIPTION_VALUE;
+#endif
default:
return ATK_ROLE_UNKNOWN;
}
@@ -735,7 +749,7 @@
if (coreObject->isPasswordField())
return ATK_ROLE_PASSWORD_TEXT;
- return atkRole(coreObject->roleValue());
+ return atkRole(coreObject);
}
static bool isTextWithCaret(AccessibilityObject* coreObject)
Modified: trunk/Tools/ChangeLog (160711 => 160712)
--- trunk/Tools/ChangeLog 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/Tools/ChangeLog 2013-12-17 18:08:34 UTC (rev 160712)
@@ -1,3 +1,17 @@
+2013-12-17 Mario Sanchez Prada <mario.pr...@samsung.com>
+
+ [ATK] Expose accessibility objects for <dl>, <dt> and <dd>
+ https://bugs.webkit.org/show_bug.cgi?id=125857
+
+ Reviewed by Chris Fleizach.
+
+ Add mappings to DRT & WKTR for the newly exposed roles, and
+ increase the version of ATK used by the internal jhbuild.
+
+ * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ * gtk/jhbuild.modules: Raise version of ATK up to 2.11.4.
+
2013-12-17 Alex Christensen <achristen...@webkit.org>
[WinCairo] Adding support for GStreamer and GLib.
Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (160711 => 160712)
--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-12-17 18:08:34 UTC (rev 160712)
@@ -340,6 +340,14 @@
case ATK_ROLE_TIMER:
return "AXTimer";
#endif
+#if ATK_CHECK_VERSION(2, 11, 4)
+ case ATK_ROLE_DESCRIPTION_LIST:
+ return "AXDescriptionList";
+ case ATK_ROLE_DESCRIPTION_TERM:
+ return "AXDescriptionTerm";
+ case ATK_ROLE_DESCRIPTION_VALUE:
+ return "AXDescriptionValue";
+#endif
default:
// We want to distinguish ATK_ROLE_UNKNOWN from a known AtkRole which
// our DRT isn't properly handling.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (160711 => 160712)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-12-17 18:08:34 UTC (rev 160712)
@@ -429,6 +429,14 @@
case ATK_ROLE_TIMER:
return "AXTimer";
#endif
+#if ATK_CHECK_VERSION(2, 11, 4)
+ case ATK_ROLE_DESCRIPTION_LIST:
+ return "AXDescriptionList";
+ case ATK_ROLE_DESCRIPTION_TERM:
+ return "AXDescriptionTerm";
+ case ATK_ROLE_DESCRIPTION_VALUE:
+ return "AXDescriptionValue";
+#endif
default:
// We want to distinguish ATK_ROLE_UNKNOWN from a known AtkRole which
// our DRT isn't properly handling.
Modified: trunk/Tools/gtk/jhbuild.modules (160711 => 160712)
--- trunk/Tools/gtk/jhbuild.modules 2013-12-17 17:56:21 UTC (rev 160711)
+++ trunk/Tools/gtk/jhbuild.modules 2013-12-17 18:08:34 UTC (rev 160712)
@@ -232,9 +232,9 @@
<autotools id="atk"
autogen-sh="configure"
autogenargs="--disable-introspection">
- <branch module="pub/GNOME/sources/atk/2.11/atk-2.11.3.tar.xz" version="2.11.3"
+ <branch module="pub/GNOME/sources/atk/2.11/atk-2.11.4.tar.xz" version="2.11.4"
repo="ftp.gnome.org"
- hash="sha256:b3c63668638dbb627a81f4333a00b744c503531d07b168405ef5f27f382a0ae4"/>
+ hash="sha256:b609fa7a3f21147d40f0fe0f47278a62c263de0eadbbbe9839f2b63a0cb07d41"/>
</autotools>
<autotools id="at-spi2-core"
