Title: [223503] releases/WebKitGTK/webkit-2.18
- Revision
- 223503
- Author
- [email protected]
- Date
- 2017-10-17 02:38:56 -0700 (Tue, 17 Oct 2017)
Log Message
Merge r222821 - AX: [ATK] aria-rowindex set on row element is not being exposed
https://bugs.webkit.org/show_bug.cgi?id=177821
Reviewed by Chris Fleizach.
Source/WebCore:
Expose the value of aria-rowindex when set on a row as an object
attribute, as we already do when it's set on a cell.
Test: accessibility/gtk/aria-rowindex-on-row.html
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(webkitAccessibleGetAttributes):
LayoutTests:
* accessibility/gtk/aria-rowindex-on-row-expected.txt: Added.
* accessibility/gtk/aria-rowindex-on-row.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog (223502 => 223503)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-10-17 09:38:54 UTC (rev 223502)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/ChangeLog 2017-10-17 09:38:56 UTC (rev 223503)
@@ -1,3 +1,13 @@
+2017-10-03 Joanmarie Diggs <[email protected]>
+
+ AX: [ATK] aria-rowindex set on row element is not being exposed
+ https://bugs.webkit.org/show_bug.cgi?id=177821
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/gtk/aria-rowindex-on-row-expected.txt: Added.
+ * accessibility/gtk/aria-rowindex-on-row.html: Added.
+
2017-10-03 Zalan Bujtas <[email protected]>
[AX] Do not trigger redundant layout on tables.
Added: releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-rowindex-on-row-expected.txt (0 => 223503)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-rowindex-on-row-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-rowindex-on-row-expected.txt 2017-10-17 09:38:56 UTC (rev 223503)
@@ -0,0 +1,10 @@
+Verifies the exposure of a mixed value of aria-pressed.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS axRow.numberAttributeValue('AXARIARowIndex') is 4
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-rowindex-on-row.html (0 => 223503)
--- releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-rowindex-on-row.html (rev 0)
+++ releases/WebKitGTK/webkit-2.18/LayoutTests/accessibility/gtk/aria-rowindex-on-row.html 2017-10-17 09:38:56 UTC (rev 223503)
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body id="body">
+<div id="content">
+ <div role="table">
+ <div id="test" role="row" aria-rowindex="4">
+ <div role="cell">test cell</div>
+ </div>
+ </div>
+</div>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+ description("Verifies the exposure of a mixed value of aria-pressed.");
+ if (window.accessibilityController) {
+ var axRow = accessibilityController.accessibleElementById("test");
+ shouldBe("axRow.numberAttributeValue('AXARIARowIndex')", "4");
+ document.getElementById("content").style.visibility = "hidden";
+ }
+</script>
+<script src=""
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (223502 => 223503)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-17 09:38:54 UTC (rev 223502)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-17 09:38:56 UTC (rev 223503)
@@ -1,3 +1,18 @@
+2017-10-03 Joanmarie Diggs <[email protected]>
+
+ AX: [ATK] aria-rowindex set on row element is not being exposed
+ https://bugs.webkit.org/show_bug.cgi?id=177821
+
+ Reviewed by Chris Fleizach.
+
+ Expose the value of aria-rowindex when set on a row as an object
+ attribute, as we already do when it's set on a cell.
+
+ Test: accessibility/gtk/aria-rowindex-on-row.html
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (webkitAccessibleGetAttributes):
+
2017-10-03 Zalan Bujtas <[email protected]>
[AX] Do not trigger redundant layout on tables.
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (223502 => 223503)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-10-17 09:38:54 UTC (rev 223502)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-10-17 09:38:56 UTC (rev 223503)
@@ -39,6 +39,7 @@
#include "AccessibilityListBoxOption.h"
#include "AccessibilityTable.h"
#include "AccessibilityTableCell.h"
+#include "AccessibilityTableRow.h"
#include "Document.h"
#include "Editing.h"
#include "Frame.h"
@@ -470,9 +471,12 @@
int columnCount = table.ariaColumnCount();
if (columnCount)
attributeSet = addToAtkAttributeSet(attributeSet, "colcount", String::number(columnCount).utf8().data());
- }
-
- if (is<AccessibilityTableCell>(*coreObject)) {
+ } else if (is<AccessibilityTableRow>(*coreObject)) {
+ auto& row = downcast<AccessibilityTableRow>(*coreObject);
+ int rowIndex = row.ariaRowIndex();
+ if (rowIndex != -1)
+ attributeSet = addToAtkAttributeSet(attributeSet, "rowindex", String::number(rowIndex).utf8().data());
+ } else if (is<AccessibilityTableCell>(*coreObject)) {
auto& cell = downcast<AccessibilityTableCell>(*coreObject);
int rowIndex = cell.ariaRowIndex();
if (rowIndex != -1)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
