[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 02:12:47 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 19346c9cb554d4f5d5f0f21d2e9ef8b9743bbdd0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Mar 6 14:40:37 2010 +0000
2010-03-06 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Eric Seidel.
https://bugs.webkit.org/show_bug.cgi?id=30895
[Gtk] The accessible hierarchy of tables is significantly incorrect for Atk
* platform/gtk/accessibility/table-hierarchy.html: Added.
* platform/gtk/accessibility/table-hierarchy-expected.txt: Added.
2010-03-06 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Eric Seidel.
https://bugs.webkit.org/show_bug.cgi?id=30895
[Gtk] The accessible hierarchy of tables is significantly incorrect for Atk
This completes the fixing of the Atk table hierarchy which was started
in bug #35418.
* accessibility/gtk/AccessibilityObjectAtk.cpp:
(AccessibilityObject::accessibilityPlatformIncludesObject):
* accessibility/AccessibilityRenderObject.cpp:
(AccessibilityRenderObject::determineAccessibilityRole):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d8a32dc..661a07a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-06 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Eric Seidel.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30895
+ [Gtk] The accessible hierarchy of tables is significantly incorrect for Atk
+
+ * platform/gtk/accessibility/table-hierarchy.html: Added.
+ * platform/gtk/accessibility/table-hierarchy-expected.txt: Added.
+
2010-03-06 Hironori Bono <hbono at chromium.org>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt b/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt
new file mode 100644
index 0000000..b3c7597
--- /dev/null
+++ b/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt
@@ -0,0 +1,30 @@
+foo bar
+Odd Even
+1 2
+3 4
+hello world
+This tests the Atk table hierarhy.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS table1.role is 'table'
+PASS table2.role is 'table'
+PASS table3.role is 'table'
+PASS children is 2
+PASS table1.childAtIndex(i).role is 'table cell'
+PASS table1.childAtIndex(i).role is 'table cell'
+PASS children is 6
+PASS table2.childAtIndex(i).role is 'table cell'
+PASS table2.childAtIndex(i).role is 'table cell'
+PASS table2.childAtIndex(i).role is 'table cell'
+PASS table2.childAtIndex(i).role is 'table cell'
+PASS table2.childAtIndex(i).role is 'table cell'
+PASS table2.childAtIndex(i).role is 'table cell'
+PASS children is 2
+PASS table3.childAtIndex(i).role is 'table cell'
+PASS table3.childAtIndex(i).role is 'table cell'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/gtk/accessibility/table-hierarchy.html b/LayoutTests/platform/gtk/accessibility/table-hierarchy.html
new file mode 100644
index 0000000..dd32dfc
--- /dev/null
+++ b/LayoutTests/platform/gtk/accessibility/table-hierarchy.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+<table>
+<tr><td>foo</td><td>bar</td></tr>
+</table>
+<table>
+<tr><th>Odd</th><th>Even</th></tr>
+<tr><td>1</td><td>2</td></tr>
+<tr><td>3</td><td>4</td></tr>
+</table>
+<table>
+<tbody>
+<tr><td>hello</td><td>world</td></tr>
+</tbody>
+</table>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+ description("This tests the Atk table hierarhy.");
+ if (window.accessibilityController) {
+ layoutTestController.dumpAsText();
+ document.getElementById("body").focus();
+ var webArea = accessibilityController.focusedElement;
+
+ var table1 = webArea.childAtIndex(0);
+ shouldBe("table1.role", "'table'");
+ var table2 = webArea.childAtIndex(1);
+ shouldBe("table2.role", "'table'");
+ var table3 = webArea.childAtIndex(2);
+ shouldBe("table3.role", "'table'");
+
+ var children = table1.childrenCount;
+ shouldBe("children", "2");
+ for (i = 0; i < children; ++i) {
+ shouldBe("table1.childAtIndex(i).role", "'table cell'");
+ }
+ children = table2.childrenCount;
+ shouldBe("children", "6");
+ for (i = 0; i < children; ++i) {
+ shouldBe("table2.childAtIndex(i).role", "'table cell'");
+ }
+ children = table3.childrenCount;
+ shouldBe("children", "2");
+ for (i = 0; i < children; ++i) {
+ shouldBe("table3.childAtIndex(i).role", "'table cell'");
+ }
+ }
+ successfullyParsed = true;
+</script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 44a8b60..8a55e7b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-03-06 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Eric Seidel.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30895
+ [Gtk] The accessible hierarchy of tables is significantly incorrect for Atk
+
+ This completes the fixing of the Atk table hierarchy which was started
+ in bug #35418.
+
+ * accessibility/gtk/AccessibilityObjectAtk.cpp:
+ (AccessibilityObject::accessibilityPlatformIncludesObject):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (AccessibilityRenderObject::determineAccessibilityRole):
+
2010-03-06 MORITA Hajime <morrita at google.com>
Reviewed by Darin Adler.
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index a8ac3af..35f702e 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2735,7 +2735,7 @@ AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole()
#if PLATFORM(GTK)
// Gtk ATs expect all tables, data and layout, to be exposed as tables.
- if (node && node->hasTagName(tdTag))
+ if (node && (node->hasTagName(tdTag) || node->hasTagName(thTag)))
return CellRole;
if (node && node->hasTagName(tableTag))
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
index fb8640d..242727c 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
@@ -41,10 +41,17 @@ AccessibilityObjectPlatformInclusion AccessibilityObject::accessibilityPlatformI
if (isMenuListPopup() || isMenuListOption())
return IgnoreObject;
- // When a list item is made up entirely of children (e.g. paragraphs)
- // the list item gets ignored. We need it.
- if (isGroup() && parent->isList())
- return IncludeObject;
+ if (isGroup()) {
+ // When a list item is made up entirely of children (e.g. paragraphs)
+ // the list item gets ignored. We need it.
+ if (parent->isList())
+ return IncludeObject;
+
+ // We expect the parent of a table cell to be a table.
+ AccessibilityObject* child = firstChild();
+ if (child && child->roleValue() == CellRole)
+ return IgnoreObject;
+ }
// Entries and password fields have extraneous children which we want to ignore.
if (parent->isPasswordField() || parent->isTextControl())
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list