Switched to using |AXPosition| for calculating word and line boundaries on Windows.

content/browser/accessibility/browser_accessibility_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/common/accessibility_messages.h"
+#include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_serializer.h"
 
 namespace content {
 
 namespace {
 
 // Search the tree recursively from |node| and return any node that has
 // a child tree ID of |ax_tree_id|.
 BrowserAccessibility* FindNodeWithChildTreeId(BrowserAccessibility* node,
                                               int ax_tree_id) {
@@ skipping 35 matching lines @@
     const ui::AXNodeData& node7 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node8 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node9 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node10 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node11 /* = ui::AXNodeData() */,
     const ui::AXNodeData& node12 /* = ui::AXNodeData() */) {
   CR_DEFINE_STATIC_LOCAL(ui::AXNodeData, empty_data, ());
   int32_t no_id = empty_data.id;
 
   ui::AXTreeUpdate update;
+  ui::AXTreeData tree_data;
+  tree_data.tree_id = 1;
+  tree_data.focused_tree_id = 1;
+  update.tree_data = tree_data;
+  update.has_tree_data = true;
   update.root_id = node1.id;
   update.nodes.push_back(node1);
   if (node2.id != no_id)
     update.nodes.push_back(node2);
   if (node3.id != no_id)
     update.nodes.push_back(node3);
   if (node4.id != no_id)
     update.nodes.push_back(node4);
   if (node5.id != no_id)
     update.nodes.push_back(node5);
@@ skipping 1182 matching lines @@
       hit_test_result = parent;
     parent = parent->PlatformGetParent();
   }
 
   last_hover_ax_tree_id_ = hit_test_result->manager()->ax_tree_id();
   last_hover_node_id_ = hit_test_result->GetId();
   last_hover_bounds_ = hit_test_result->GetScreenBoundsRect();
 }
 
 }  // namespace content