[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cfleizach at apple.com
cfleizach at apple.com
Wed Dec 22 14:35:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ca629d98089b15ab9b905e14ff922d8e230e89b6
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 13 22:53:32 2010 +0000
AX: accessibilityIsIgnored not respected on ARIA tables
https://bugs.webkit.org/show_bug.cgi?id=47564
Reviewed by Beth Dakin.
WebCore:
For platforms that ignore column headers and header container objects (everything
except Mac) on accessibility tables, that choice needs to be respected in
ARIA tables as well.
GTK is the only open platform doing this, so I'll have to collect the result of this
test. It was copied from table-hierarchy.html, but changed to use ARIA tables.
Test: platform/gtk/accessibility/aria-table-hierarchy.html
* accessibility/AccessibilityARIAGrid.cpp:
(WebCore::AccessibilityARIAGrid::addChildren):
LayoutTests:
Will gather the results from GTK after this runs.
* platform/gtk/accessibility/aria-table-hierarchy.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69707 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1ac7987..a827afa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-13 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Beth Dakin.
+
+ AX: accessibilityIsIgnored not respected on ARIA tables
+ https://bugs.webkit.org/show_bug.cgi?id=47564
+
+ Will gather the results from GTK after this runs.
+
+ * platform/gtk/accessibility/aria-table-hierarchy.html: Added.
+
2010-10-13 Zhenyao Mo <zmo at google.com>
Unreviewed, update WebGL test expectations.
diff --git a/LayoutTests/platform/gtk/accessibility/aria-table-hierarchy.html b/LayoutTests/platform/gtk/accessibility/aria-table-hierarchy.html
new file mode 100644
index 0000000..8714386
--- /dev/null
+++ b/LayoutTests/platform/gtk/accessibility/aria-table-hierarchy.html
@@ -0,0 +1,78 @@
+<!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">
+<div role="grid">
+<div role="row"><div role="gridcell">foo</div><div role="gridcell">bar</div></div>
+</div>
+<div role="grid">
+<div role="row"><div role="columnheader">Odd</div><div role="columnheader">Even</div></div>
+<div role="row"><div role="gridcell">1</div><div role="gridcell">2</div></div>
+<div role="row"><div role="gridcell">3</div><div role="gridcell">4</div></div>
+</div>
+<div role="grid">
+<div role="row"><div role="gridcell">hello</div><div role="gridcell">world</div></div>
+</div>
+<div role="grid">
+<div role="row"><div role="columnheader">Odd</div><div role="columnheader">Even</div></div>
+<div role="row"><div role="gridcell"><p>1</p></div><div role="gridcell"><p>2</p></div></div>
+<div role="row"><div role="gridcell"><p>3</p></div><div role="gridcell"><p>4</p></div></div>
+</div>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+ description("This tests the Atk table hierarhy for an ARIA table.");
+ if (window.accessibilityController) {
+ layoutTestController.dumpAsText();
+ document.getElementById("body").focus();
+ var webArea = accessibilityController.focusedElement;
+
+ var table1 = webArea.childAtIndex(0);
+ shouldBe("table1.role", "'AXRole: table'");
+ shouldBe("table1.rowCount", "1");
+ shouldBe("table1.columnCount", "2");
+ var table2 = webArea.childAtIndex(1);
+ shouldBe("table2.role", "'AXRole: table'");
+ shouldBe("table2.rowCount", "3");
+ shouldBe("table2.columnCount", "2");
+ var table3 = webArea.childAtIndex(2);
+ shouldBe("table3.role", "'AXRole: table'");
+ shouldBe("table3.rowCount", "1");
+ shouldBe("table3.columnCount", "2");
+ var table4 = webArea.childAtIndex(3);
+ shouldBe("table4.role", "'AXRole: table'");
+ shouldBe("table4.rowCount", "3");
+ shouldBe("table4.columnCount", "2");
+
+ var children = table1.childrenCount;
+ shouldBe("children", "2");
+ for (i = 0; i < children; ++i) {
+ shouldBe("table1.childAtIndex(i).role", "'AXRole: table cell'");
+ }
+ children = table2.childrenCount;
+ shouldBe("children", "6");
+ for (i = 0; i < children; ++i) {
+ shouldBe("table2.childAtIndex(i).role", "'AXRole: table cell'");
+ }
+ children = table3.childrenCount;
+ shouldBe("children", "2");
+ for (i = 0; i < children; ++i) {
+ shouldBe("table3.childAtIndex(i).role", "'AXRole: table cell'");
+ }
+ children = table4.childrenCount;
+ shouldBe("children", "6");
+ for (i = 0; i < children; ++i) {
+ shouldBe("table4.childAtIndex(i).role", "'AXRole: 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 bd0088c..13eab86 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-13 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Beth Dakin.
+
+ AX: accessibilityIsIgnored not respected on ARIA tables
+ https://bugs.webkit.org/show_bug.cgi?id=47564
+
+ For platforms that ignore column headers and header container objects (everything
+ except Mac) on accessibility tables, that choice needs to be respected in
+ ARIA tables as well.
+
+ GTK is the only open platform doing this, so I'll have to collect the result of this
+ test. It was copied from table-hierarchy.html, but changed to use ARIA tables.
+
+ Test: platform/gtk/accessibility/aria-table-hierarchy.html
+
+ * accessibility/AccessibilityARIAGrid.cpp:
+ (WebCore::AccessibilityARIAGrid::addChildren):
+
2010-10-13 Victoria Kirst <vrk at google.com>
Reviewed by James Robinson.
diff --git a/WebCore/accessibility/AccessibilityARIAGrid.cpp b/WebCore/accessibility/AccessibilityARIAGrid.cpp
index 58b3fa1..0d9f845 100644
--- a/WebCore/accessibility/AccessibilityARIAGrid.cpp
+++ b/WebCore/accessibility/AccessibilityARIAGrid.cpp
@@ -118,11 +118,12 @@ void AccessibilityARIAGrid::addChildren()
column->setColumnIndex((int)i);
column->setParentTable(this);
m_columns.append(column);
- m_children.append(column);
+ if (!column->accessibilityIsIgnored())
+ m_children.append(column);
}
AccessibilityObject* headerContainerObject = headerContainer();
- if (headerContainerObject)
+ if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored())
m_children.append(headerContainerObject);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list