From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/accessibility/ax_table_fuzzer.cc | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'chromium/ui/accessibility/ax_table_fuzzer.cc') diff --git a/chromium/ui/accessibility/ax_table_fuzzer.cc b/chromium/ui/accessibility/ax_table_fuzzer.cc index 9925f9bf79f..1ee955ee38f 100644 --- a/chromium/ui/accessibility/ax_table_fuzzer.cc +++ b/chromium/ui/accessibility/ax_table_fuzzer.cc @@ -98,12 +98,21 @@ void TestTableAPIs(const ui::AXNode* node) { // crash. Normally |ids| is an out argument only, but // there's no reason we shouldn't be able to pass a vector // that was previously used by another call. - std::vector ids; + std::vector ids; for (int i = 0; i < 3; i++) { - node->GetTableColHeaderNodeIds(i, &ids); - node->GetTableRowHeaderNodeIds(i, &ids); + std::vector col_header_node_ids = + node->GetTableColHeaderNodeIds(i); + ids.insert(ids.end(), col_header_node_ids.begin(), + col_header_node_ids.end()); + + std::vector row_header_node_ids = + node->GetTableRowHeaderNodeIds(i); + ids.insert(ids.end(), row_header_node_ids.begin(), + row_header_node_ids.end()); } - node->GetTableUniqueCellIds(&ids); + std::vector unique_cell_ids = node->GetTableUniqueCellIds(); + ids.insert(ids.end(), unique_cell_ids.begin(), unique_cell_ids.end()); + ignore_result(node->IsTableRow()); ignore_result(node->GetTableRowRowIndex()); #if defined(OS_MACOSX) @@ -118,8 +127,14 @@ void TestTableAPIs(const ui::AXNode* node) { ignore_result(node->GetTableCellRowSpan()); ignore_result(node->GetTableCellAriaColIndex()); ignore_result(node->GetTableCellAriaRowIndex()); - node->GetTableCellColHeaderNodeIds(&ids); - node->GetTableCellRowHeaderNodeIds(&ids); + std::vector cell_col_header_node_ids = + node->GetTableCellColHeaderNodeIds(); + ids.insert(ids.end(), cell_col_header_node_ids.begin(), + cell_col_header_node_ids.end()); + std::vector cell_row_header_node_ids = + node->GetTableCellRowHeaderNodeIds(); + ids.insert(ids.end(), cell_row_header_node_ids.begin(), + cell_row_header_node_ids.end()); std::vector headers; node->GetTableCellColHeaders(&headers); node->GetTableCellRowHeaders(&headers); -- cgit v1.2.1