Changeset 222276 in webkit

Timestamp:

Sep 20, 2017 12:30:15 PM (7 years ago)

Author:

jdiggs@igalia.com

Message:

[ATK] atk_table_get_n_rows() and atk_table_get_n_columns() should return values of aria-rowcount and aria-colcount, if present
​https://bugs.webkit.org/show_bug.cgi?id=171172

Reviewed by Chris Fleizach.

Source/WebCore:

Modify webKitAccessibleTableGetNColumns() and webkitAccessibleTableGetNRows()
to prefer the ARIA value over the DOM-based value.

No new tests needed: We already have coverage through aria-table-attributes.html.
Platform expectations for this test were updated.

• accessibility/atk/WebKitAccessibleInterfaceTable.cpp:

(webkitAccessibleTableGetNColumns):
(webkitAccessibleTableGetNRows):

LayoutTests:

Generated platform-specific expectations to reflect the new behavior.

• accessibility/aria-table-attributes.html: Modified to handle platform differences.
• platform/gtk/accessibility/aria-table-attributes-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/aria-table-attributes.html (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/aria-table-attributes-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-09-20  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        [ATK] atk_table_get_n_rows() and atk_table_get_n_columns() should return values of aria-rowcount and aria-colcount, if present
+        https://bugs.webkit.org/show_bug.cgi?id=171172
+
+        Reviewed by Chris Fleizach.
+
+        Generated platform-specific expectations to reflect the new behavior.
+
+        * accessibility/aria-table-attributes.html: Modified to handle platform differences.
+        * platform/gtk/accessibility/aria-table-attributes-expected.txt: Added.
+
 2017-09-20  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/accessibility/aria-table-attributes.html

@@ -82 +82 @@
           shouldBe("grid.numberAttributeValue('AXARIAColumnCount')", "16");
           shouldBe("grid.numberAttributeValue('AXARIARowCount')", "30");
-          shouldBe("grid.rowCount", "4");
-          shouldBe("grid.columnCount", "4");
+          if (accessibilityController.platformName == "atk") {
+              shouldBe("grid.rowCount", "30");
+              shouldBe("grid.columnCount", "16");
+          } else {
+              shouldBe("grid.rowCount", "4");
+              shouldBe("grid.columnCount", "4");
+          }
           
           // aria-colindex and aria-rowindex

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-09-20  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        [ATK] atk_table_get_n_rows() and atk_table_get_n_columns() should return values of aria-rowcount and aria-colcount, if present
+        https://bugs.webkit.org/show_bug.cgi?id=171172
+
+        Reviewed by Chris Fleizach.
+
+        Modify webKitAccessibleTableGetNColumns() and webkitAccessibleTableGetNRows()
+        to prefer the ARIA value over the DOM-based value.
+
+        No new tests needed: We already have coverage through aria-table-attributes.html.
+        Platform expectations for this test were updated.
+
+        * accessibility/atk/WebKitAccessibleInterfaceTable.cpp:
+        (webkitAccessibleTableGetNColumns):
+        (webkitAccessibleTableGetNRows):
+
 2017-09-20  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp

@@ -150 +150 @@
 
     AccessibilityObject* accTable = core(table);
-    if (is<AccessibilityTable>(*accTable))
-        return downcast<AccessibilityTable>(*accTable).columnCount();
-    return 0;
+    if (!is<AccessibilityTable>(*accTable))
+        return 0;
+
+    if (int columnCount = downcast<AccessibilityTable>(*accTable).ariaColumnCount())
+        return columnCount;
+
+    return downcast<AccessibilityTable>(*accTable).columnCount();
 }
 
@@ -161 +165 @@
 
     AccessibilityObject* accTable = core(table);
-    if (is<AccessibilityTable>(*accTable))
-        return downcast<AccessibilityTable>(*accTable).rowCount();
-    return 0;
+    if (!is<AccessibilityTable>(*accTable))
+        return 0;
+
+    if (int rowCount = downcast<AccessibilityTable>(*accTable).ariaRowCount())
+        return rowCount;
+
+    return downcast<AccessibilityTable>(*accTable).rowCount();
 }