[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:23:57 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 03c2e312b29b84b5d3ac3c3241e5fd176bcc5070
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 16 18:18:53 2010 +0000
2010-03-16 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Xan Lopez.
Added layout tests to get the number of rows and columns.
https://bugs.webkit.org/show_bug.cgi?id=35504
[Gtk] Evaluate and fix AtkTable for layout tables
* platform/gtk/accessibility/table-hierarchy.html:
* platform/gtk/accessibility/table-hierarchy-expected.txt:
2010-03-16 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Xan Lopez.
https://bugs.webkit.org/show_bug.cgi?id=35504
[Gtk] Evaluate and fix AtkTable for layout tables
Causes "layout tables" to be exposed as AccessibilityTables for Gtk.
* accessibility/AccessibilityTable.cpp:
(AccessibilityTable::isTableExposableThroughAccessibility):
2010-03-16 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Xan Lopez.
https://bugs.webkit.org/show_bug.cgi?id=35504
[Gtk] Evaluate and fix AtkTable for layout tables
Implements rowCount and columnCount for Gtk in DRT.
* DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
(AccessibilityUIElement::rowCount):
(AccessibilityUIElement::columnCount):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56073 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a70782e..3a4176e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-16 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Xan Lopez.
+
+ Added layout tests to get the number of rows and columns.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35504
+ [Gtk] Evaluate and fix AtkTable for layout tables
+
+ * platform/gtk/accessibility/table-hierarchy.html:
+ * platform/gtk/accessibility/table-hierarchy-expected.txt:
+
2010-03-16 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: inspector http test fix that migrates it to the new inspector api.
diff --git a/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt b/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt
index a48d28f..1ba3345 100644
--- a/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt
+++ b/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt
@@ -18,9 +18,17 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS table1.role is 'table'
+PASS table1.rowCount is 1
+PASS table1.columnCount is 2
PASS table2.role is 'table'
+PASS table2.rowCount is 3
+PASS table2.columnCount is 2
PASS table3.role is 'table'
+PASS table3.rowCount is 1
+PASS table3.columnCount is 2
PASS table4.role is 'table'
+PASS table4.rowCount is 3
+PASS table4.columnCount is 2
PASS children is 2
PASS table1.childAtIndex(i).role is 'table cell'
PASS table1.childAtIndex(i).role is 'table cell'
diff --git a/LayoutTests/platform/gtk/accessibility/table-hierarchy.html b/LayoutTests/platform/gtk/accessibility/table-hierarchy.html
index 11cc8b8..7507ffe 100644
--- a/LayoutTests/platform/gtk/accessibility/table-hierarchy.html
+++ b/LayoutTests/platform/gtk/accessibility/table-hierarchy.html
@@ -37,12 +37,20 @@ var successfullyParsed = false;
var table1 = webArea.childAtIndex(0);
shouldBe("table1.role", "'table'");
+ shouldBe("table1.rowCount", "1");
+ shouldBe("table1.columnCount", "2");
var table2 = webArea.childAtIndex(1);
shouldBe("table2.role", "'table'");
+ shouldBe("table2.rowCount", "3");
+ shouldBe("table2.columnCount", "2");
var table3 = webArea.childAtIndex(2);
shouldBe("table3.role", "'table'");
+ shouldBe("table3.rowCount", "1");
+ shouldBe("table3.columnCount", "2");
var table4 = webArea.childAtIndex(3);
shouldBe("table4.role", "'table'");
+ shouldBe("table4.rowCount", "3");
+ shouldBe("table4.columnCount", "2");
var children = table1.childrenCount;
shouldBe("children", "2");
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 423d57b..3df47eb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-16 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Xan Lopez.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35504
+ [Gtk] Evaluate and fix AtkTable for layout tables
+
+ Causes "layout tables" to be exposed as AccessibilityTables for Gtk.
+
+ * accessibility/AccessibilityTable.cpp:
+ (AccessibilityTable::isTableExposableThroughAccessibility):
+
2010-03-16 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Unreviewed. Build fix for distcheck.
diff --git a/WebCore/accessibility/AccessibilityTable.cpp b/WebCore/accessibility/AccessibilityTable.cpp
index 2190180..aed8867 100644
--- a/WebCore/accessibility/AccessibilityTable.cpp
+++ b/WebCore/accessibility/AccessibilityTable.cpp
@@ -94,6 +94,11 @@ bool AccessibilityTable::isTableExposableThroughAccessibility()
Node* tableNode = table->node();
if (!tableNode || !tableNode->hasTagName(tableTag))
return false;
+
+ // Gtk+ ATs expect all tables to be exposed as tables.
+#if PLATFORM(GTK)
+ return true;
+#endif
// if there is a caption element, summary, THEAD, or TFOOT section, it's most certainly a data table
HTMLTableElement* tableElement = static_cast<HTMLTableElement*>(tableNode);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 91821e4..e8770a7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-16 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Xan Lopez.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35504
+ [Gtk] Evaluate and fix AtkTable for layout tables
+
+ Implements rowCount and columnCount for Gtk in DRT.
+
+ * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
+ (AccessibilityUIElement::rowCount):
+ (AccessibilityUIElement::columnCount):
+
2010-03-15 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
index 7ac5308..52776cd 100644
--- a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
@@ -77,14 +77,22 @@ void AccessibilityUIElement::getChildrenWithRange(Vector<AccessibilityUIElement>
int AccessibilityUIElement::rowCount()
{
- // FIXME: implement
- return 0;
+ if (!m_element)
+ return 0;
+
+ ASSERT(ATK_IS_TABLE(m_element));
+
+ return atk_table_get_n_rows(ATK_TABLE(m_element));
}
int AccessibilityUIElement::columnCount()
{
- // FIXME: implement
- return 0;
+ if (!m_element)
+ return 0;
+
+ ASSERT(ATK_IS_TABLE(m_element));
+
+ return atk_table_get_n_columns(ATK_TABLE(m_element));
}
int AccessibilityUIElement::childrenCount()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list