Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
index 3ce0930b59b0a7558d0b8cf2483950d7b42c6c20..982a3ea45b3a990f9a353cae1a7c04e8b49a348c 100644 |
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js |
@@ -427,10 +427,14 @@ Output.RULES = { |
speak: '$earcon(ALERT_MODAL) $name $nameOrTextContent $state $role' |
}, |
cell: { |
- enter: '@cell_summary($tableCellRowIndex, $tableCellColumnIndex) ' + |
- '$node(tableColumnHeader)', |
- speak: '@cell_summary($tableCellRowIndex, $tableCellColumnIndex) ' + |
- '$node(tableColumnHeader) $state' |
+ enter: '@cell_summary($if($ariaCellRowIndex, $ariaCellRowIndex, ' + |
+ '$tableCellRowIndex), ' + |
+ '$if($ariaCellColumnIndex, $ariaCellColumnIndex, ' + |
+ '$tableCellColumnIndex)) $node(tableColumnHeader)', |
+ speak: '@cell_summary($if($ariaCellRowIndex, $ariaCellRowIndex, ' + |
+ '$tableCellRowIndex), ' + |
+ '$if($ariaCellColumnIndex, $ariaCellColumnIndex, ' + |
+ '$tableCellColumnIndex)) $node(tableColumnHeader) $state' |
}, |
checkBox: { |
speak: '$if($checked, $earcon(CHECK_ON), $earcon(CHECK_OFF)) ' + |
@@ -564,7 +568,9 @@ Output.RULES = { |
'$if($setSize, @describe_index($posInSet, $setSize))', |
}, |
table: { |
- enter: '@table_summary($name, $tableRowCount, $tableColumnCount) ' + |
+ enter: '@table_summary($name, ' + |
+ '$if($ariaRowCount, $ariaRowCount, $tableRowCount), ' + |
+ '$if($ariaColumnCount, $ariaColumnCount, $tableColumnCount)) ' + |
'$node(tableHeader)' |
}, |
tableHeaderContainer: { |