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

content/browser/accessibility/browser_accessibility.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 154 matching lines @@
   // (which is relative to its nearest scrollable ancestor) to
   // absolute bounds, either in page coordinates (when |frameOnly| is
   // false), or in frame coordinates (when |frameOnly| is true).
   virtual gfx::Rect RelativeToAbsoluteBounds(gfx::RectF bounds,
                                              bool frame_only) const;
 
   // This is to handle the cases such as ARIA textbox, where the value should
   // be calculated from the object's inner text.
   virtual base::string16 GetValue() const;
 
-  // Starting at the given character offset, locates the start of the next or
-  // previous line and returns its character offset.
-  int GetLineStartBoundary(int start,
-                           ui::TextBoundaryDirection direction,
-                           ui::AXTextAffinity affinity) const;
-
-  // Starting at the given character offset, locates the start of the next or
-  // previous word and returns its character offset.
-  // In case there is no word boundary before or after the given offset, it
-  // returns one past the last character.
-  // If the given offset is already at the start of a word, returns the start
-  // of the next word if the search is forwards, and the given offset if it is
-  // backwards.
-  // If the start offset is equal to -1 and the search is in the forwards
-  // direction, returns the start boundary of the first word.
-  // Start offsets that are not in the range -1 to text length are invalid.
-  int GetWordStartBoundary(int start,
-                           ui::TextBoundaryDirection direction) const;
-
   // This is an approximate hit test that only uses the information in
   // the browser process to compute the correct result. It will not return
   // correct results in many cases of z-index, overflow, and absolute
   // positioning, so BrowserAccessibilityManager::CachingAsyncHitTest
   // should be used instead, which falls back on calling ApproximateHitTest
   // automatically.
   BrowserAccessibility* ApproximateHitTest(const gfx::Point& screen_point);
 
   // Marks this object for deletion, releases our reference to it, and
   // nulls out the pointer to the underlying AXNode.  May not delete
@@ skipping 145 matching lines @@
   bool IsMenuRelated() const;
   bool IsNativeTextControl() const;
   bool IsSimpleTextControl() const;
   // Indicates if this object is at the root of a rich edit text control.
   bool IsRichTextControl() const;
 
   // If an object is focusable but has no accessible name, use this
   // to compute a name from its descendants.
   std::string ComputeAccessibleNameFromDescendants();
 
-  // Creates a position rooted at this object.
-  // This is a text position on all platforms except IA2 and ATK, where tree
-  // positions are created for non-text objects representing hypertext offsets.
-  virtual AXPlatformPosition::AXPositionInstance CreatePositionAt(
-      int offset) const;
+  // Creates a text position rooted at this object.
+  AXPlatformPosition::AXPositionInstance CreatePositionAt(
+      int offset,
+      ui::AXTextAffinity affinity = ui::AX_TEXT_AFFINITY_DOWNSTREAM) const;
 
   // Gets the text offsets where new lines start.
   std::vector<int> GetLineStartOffsets() const;
 
   // AXPlatformNodeDelegate.
   const ui::AXNodeData& GetData() const override;
   gfx::NativeWindow GetTopLevelWidget() override;
   gfx::NativeViewAccessible GetParent() override;
   int GetChildCount() override;
   gfx::NativeViewAccessible ChildAtIndex(int index) override;
@@ skipping 31 matching lines @@
   // bounds, but "virtual" elements in the accessibility tree that don't
   // correspond to a layed-out element sometimes don't have bounds.
   void FixEmptyBounds(gfx::RectF* bounds) const;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_