Changeset 55680 in webkit

Timestamp:

Mar 8, 2010 1:06:08 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-08 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Xan Lopez.

​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:
• platform/gtk/accessibility/table-hierarchy-expected.txt:

2010-03-08 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=30895
[Gtk] The accessible hierarchy of tables is significantly incorrect for Atk

Gives platforms the ability to exclude parts of an AccessibilityTable
from the accessible hierarchy.

• accessibility/gtk/AccessibilityObjectAtk.cpp: (AccessibilityObject::accessibilityPlatformIncludesObject):
• accessibility/AccessibilityRenderObject.cpp: (AccessibilityRenderObject::determineAccessibilityRole):
• accessibility/AccessibilityTable.cpp: (AccessibilityTable::addChildren):
• accessibility/AccessibilityTableColumn.h: (accessibilityIsIgnored):
• accessibility/AccessibilityTableHeaderContainer.h: (accessibilityIsIgnored):
• accessibility/AccessibilityTableRow.cpp: (accessibilityIsIgnored):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt (modified) (3 diffs)
• LayoutTests/platform/gtk/accessibility/table-hierarchy.html (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• WebCore/accessibility/AccessibilityTable.cpp (modified) (2 diffs)
• WebCore/accessibility/AccessibilityTableColumn.h (modified) (1 diff)
• WebCore/accessibility/AccessibilityTableHeaderContainer.h (modified) (1 diff)
• WebCore/accessibility/AccessibilityTableRow.cpp (modified) (1 diff)
• WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-08  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        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:
+        * platform/gtk/accessibility/table-hierarchy-expected.txt:
+
 2010-03-08  Adam Barth  <abarth@webkit.org>
 

trunk/LayoutTests/platform/gtk/accessibility/table-hierarchy-expected.txt

@@ -4 +4 @@
 3       4
 hello   world
+Odd     Even
+1
+
+2
+
+3
+
+4
+
 This tests the Atk table hierarhy.
 
@@ -12 +21 @@
 PASS table2.role is 'table'
 PASS table3.role is 'table'
+PASS table4.role is 'table'
 PASS children is 2
 PASS table1.childAtIndex(i).role is 'table cell'
@@ -25 +35 @@
 PASS table3.childAtIndex(i).role is 'table cell'
 PASS table3.childAtIndex(i).role is 'table cell'
+PASS children is 6
+PASS table4.childAtIndex(i).role is 'table cell'
+PASS table4.childAtIndex(i).role is 'table cell'
+PASS table4.childAtIndex(i).role is 'table cell'
+PASS table4.childAtIndex(i).role is 'table cell'
+PASS table4.childAtIndex(i).role is 'table cell'
+PASS table4.childAtIndex(i).role is 'table cell'
 PASS successfullyParsed is true
 

trunk/LayoutTests/platform/gtk/accessibility/table-hierarchy.html

@@ -22 +22 @@
 </tbody>
 </table>
+<table border=1>
+<tr><th>Odd</th><th>Even</th></tr>
+<tr><td><p>1</p></td><td><p>2</p></td></tr>
+<tr><td><p>3</p></td><td><p>4</p></td></tr>
+</table>
 <p id="description"></p>
 <div id="console"></div>
@@ -37 +42 @@
         var table3 = webArea.childAtIndex(2);
         shouldBe("table3.role", "'table'");
+        var table4 = webArea.childAtIndex(3);
+        shouldBe("table4.role", "'table'");
 
         var children = table1.childrenCount;
@@ -53 +60 @@
             shouldBe("table3.childAtIndex(i).role", "'table cell'");
         }
+        children = table4.childrenCount;
+        shouldBe("children", "6");
+        for (i = 0; i < children; ++i) {
+            shouldBe("table4.childAtIndex(i).role", "'table cell'");
+        }
     }
     successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-08  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30895
+        [Gtk] The accessible hierarchy of tables is significantly incorrect for Atk
+
+        Gives platforms the ability to exclude parts of an AccessibilityTable
+        from the accessible hierarchy.
+
+        * accessibility/gtk/AccessibilityObjectAtk.cpp:
+        (AccessibilityObject::accessibilityPlatformIncludesObject):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (AccessibilityRenderObject::determineAccessibilityRole):
+        * accessibility/AccessibilityTable.cpp:
+        (AccessibilityTable::addChildren):
+        * accessibility/AccessibilityTableColumn.h:
+        (accessibilityIsIgnored):
+        * accessibility/AccessibilityTableHeaderContainer.h:
+        (accessibilityIsIgnored):
+        * accessibility/AccessibilityTableRow.cpp:
+        (accessibilityIsIgnored):
+
 2010-03-08  Jian Li  <jianli@chromium.org>
 

trunk/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -2739 +2739 @@
         return CellRole;
 
+    if (node && node->hasTagName(trTag))
+        return RowRole;
+
     if (node && node->hasTagName(tableTag))
         return TableRole;

trunk/WebCore/accessibility/AccessibilityTable.cpp

@@ -251 +251 @@
                 row->setRowIndex((int)m_rows.size());        
                 m_rows.append(row);
-                m_children.append(row);
+                if (!row->accessibilityIsIgnored())
+                    m_children.append(row);
+#if PLATFORM(GTK)
+                else
+                    m_children.append(row->children());
+#endif
                 appendedRows.add(row);
             }
@@ -266 +271 @@
         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);
 }

trunk/WebCore/accessibility/AccessibilityTableColumn.h

@@ -51 +51 @@
         
     virtual AccessibilityRole roleValue() const { return ColumnRole; }
+#if PLATFORM(GTK)
+    virtual bool accessibilityIsIgnored() const { return true; }
+#else
     virtual bool accessibilityIsIgnored() const { return false; }
+#endif
     virtual bool isTableColumn() const { return true; }
     

trunk/WebCore/accessibility/AccessibilityTableHeaderContainer.h

@@ -49 +49 @@
     virtual AccessibilityObject* parentObject() const { return m_parentTable; }
     
+#if PLATFORM(GTK)
+    virtual bool accessibilityIsIgnored() const { return true; }
+#else
     virtual bool accessibilityIsIgnored() const { return false; }
+#endif
     
     virtual const AccessibilityChildrenVector& children();

trunk/WebCore/accessibility/AccessibilityTableRow.cpp

@@ -77 +77 @@
 bool AccessibilityTableRow::accessibilityIsIgnored() const
 {    
+#if PLATFORM(GTK)
+    if (true)
+#else
     if (!isTableRow())
+#endif
         return AccessibilityRenderObject::accessibilityIsIgnored();
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp

@@ -64 +64 @@
         return IncludeObject;
 
+    // We at some point might have a need to expose a table row; but it's not standard Gtk+.
+    if (role == RowRole)
+        return IgnoreObject;
+
     // The object containing the text should implement AtkText itself.
     if (role == StaticTextRole)