content/browser/accessibility/browser_accessibility_win_unittest.cc - Issue 1413423003: Move some AX attrs from AXNodeData to AXTreeData.

Unified Diff: content/browser/accessibility/browser_accessibility_win_unittest.cc

Issue 1413423003: Move some AX attrs from AXNodeData to AXTreeData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/accessibility/browser_accessibility_win.cc ('k') | content/browser/accessibility/cross_platform_accessibility_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/accessibility/browser_accessibility_win_unittest.cc

diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc

index b7a41e77838c4f52863dc2dfe426d020ca9ff1ce..b81dc5771c23e3613a670678682243758e109ff4 100644

--- a/content/browser/accessibility/browser_accessibility_win_unittest.cc

+++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc

@@ -969,21 +969,25 @@ TEST_F(BrowserAccessibilityTest, TestCaretInContentEditables) {

(1 << ui::AX_STATE_FOCUSABLE) | (1 << ui::AX_STATE_LINKED);

link_text.SetName("here");

- // Place the caret between 'h' and 'e'.

- root.AddIntAttribute(ui::AX_ATTR_ANCHOR_OBJECT_ID, 5);

- root.AddIntAttribute(ui::AX_ATTR_ANCHOR_OFFSET, 1);

- root.AddIntAttribute(ui::AX_ATTR_FOCUS_OBJECT_ID, 5);

- root.AddIntAttribute(ui::AX_ATTR_FOCUS_OFFSET, 1);

root.child_ids.push_back(2);

div_editable.child_ids.push_back(3);

div_editable.child_ids.push_back(4);

link.child_ids.push_back(5);

+ ui::AXTreeUpdate update = MakeAXTreeUpdate(

+ root, div_editable, link, link_text, text);

+ // Place the caret between 'h' and 'e'.

+ update.has_tree_data = true;

+ update.tree_data.sel_anchor_object_id = 5;

+ update.tree_data.sel_anchor_offset = 1;

+ update.tree_data.sel_focus_object_id = 5;

+ update.tree_data.sel_focus_offset = 1;

CountedBrowserAccessibility::reset();

scoped_ptr<BrowserAccessibilityManager> manager(

BrowserAccessibilityManager::Create(

- MakeAXTreeUpdate(root, div_editable, link, link_text, text),

+ update,

nullptr, new CountedBrowserAccessibilityFactory()));

ASSERT_EQ(5, CountedBrowserAccessibility::num_instances());

@@ -1084,21 +1088,25 @@ TEST_F(BrowserAccessibilityTest, TestSelectionInContentEditables) {

link_text.state = (1 << ui::AX_STATE_FOCUSABLE) | (1 << ui::AX_STATE_LINKED);

link_text.SetName("here");

- // Select the following part of the text: "lick here".

- root.AddIntAttribute(ui::AX_ATTR_ANCHOR_OBJECT_ID, 3);