Fixes for contenteditable caret and selection handling in Windows.

content/browser/accessibility/browser_accessibility_win.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_WIN_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
@@ skipping 748 matching lines @@
   // If the bool attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void BoolAttributeToIA2(ui::AXBoolAttribute attribute,
                           const char* ia2_attr);
 
   // If the int attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void IntAttributeToIA2(ui::AXIntAttribute attribute,
                          const char* ia2_attr);
 
-  // Functions that help in retrieving hyperlinks. Return -1 in case of failure.
+  // Functions that help when retrieving hyperlinks. Return -1 in case of
+  // failure.
   // (Hyperlink is an IA2 misnomer. It refers to objects embedded within other
   // objects, such as a numbered list within a contenteditable div.)
   int32 GetHyperlinkIndexFromChild(const BrowserAccessibilityWin& child) const;
   int32 GetHypertextOffsetFromHyperlinkIndex(int32 hyperlink_index) const;
   int32 GetHypertextOffsetFromChild(const BrowserAccessibilityWin& child) const;
   int32 GetHypertextOffsetFromDescendant(
       const BrowserAccessibilityWin& descendant) const;
 
+  // If the selection endpoint is either equal to or an ancestor of this object,
+  // returns endpoint_offset.
+  // If the selection endpoint is a descendant of this object, returns its
+  // embedded character offset. Otherwise, returns either 0 or the length of the
+  // hypertext, depending on the direction of the selection.
+  // Returns -1 in case of unexpected failure, e.g. the selection endpoint
+  // cannot be located in the accessibility tree.
+  int GetHypertextOffsetFromEndpoint(
+      const BrowserAccessibilityWin& endpoint_object,
+      int endpoint_offset) const;
+
   // The following functions retrieve the endpoints of the current selection.
-  // First they checks for a local selection found on the current control, e.g.
+  // First they check for a local selection found on the current control, e.g.
   // when querying the selection on a textarea.
   // If not found they retrieve the global selection found on the current frame.
   int GetSelectionAnchor() const;
   int GetSelectionFocus() const;
   // Retrieves the selection offsets in the way required by the IA2 APIs.
-  // (Selection_start is always <= selection_end and
-  // selection_end is one past the last character of the selection.)
+  // selection_start and selection_end are -1 when there is no selection active
+  // inside this object.
+  // The greatest of the two offsets is one past the last character of the
+  // selection.)
   void GetSelectionOffsets(int* selection_start, int* selection_end) const;
 
   // Append the accessible name from this node and its children.
   base::string16 GetNameRecursive() const;
 
   // Get the value text, which might come from the floating-point
   // value for some roles.
   base::string16 GetValueText();
 
   // Get the text of this node for the purposes of IAccessibleText - it may
   // be the name, it may be the value, etc. depending on the role.
-  base::string16 TextForIAccessibleText();
+  base::string16 TextForIAccessibleText() const;
 
   bool IsSameHypertextCharacter(size_t old_char_index, size_t new_char_index);
   void ComputeHypertextRemovedAndInserted(
       int* start, int* old_len, int* new_len);
 
   // If offset is a member of IA2TextSpecialOffsets this function updates the
   // value of offset and returns, otherwise offset remains unchanged.
   void HandleSpecialTextOffset(const base::string16& text, LONG* offset);
 
   // Convert from a IA2TextBoundaryType to a ui::TextBoundaryType.
@@ skipping 40 matching lines @@
     int32 ia2_state;
 
     // IAccessible2 attributes.
     std::vector<base::string16> ia2_attributes;
 
     // Hypertext.
     base::string16 hypertext;
 
     // Maps the |hypertext_| embedded character offset to an index in
     // |hyperlinks_|.
-    // TODO(nektar): Replace map with vector of offsets.
     std::map<int32, int32> hyperlink_offset_to_index;
 
     // The id of a BrowserAccessibilityWin for each hyperlink.
     // TODO(nektar): Replace object IDs with child indices.
     std::vector<int32> hyperlinks;
   };
 
   scoped_ptr<WinAttributes> win_attributes_;
 
   // Only valid during the scope of a IA2_EVENT_TEXT_REMOVED or
@@ skipping 13 matching lines @@
   // Give BrowserAccessibility::Create access to our constructor.
   friend class BrowserAccessibility;
   friend class BrowserAccessibilityRelation;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_