Fixed algorithms that compute bounding rectangles and word start offsets to take into account IA2 h…

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 269 matching lines @@
   // The following attributes are appropriate to use with this method:
   // aria-selected  (selectable)
   // aria-grabbed   (grabbable)
   // aria-expanded  (expandable)
   // aria-pressed   (toggleable/pressable) -- supports 4th "mixed" state
   // aria-checked   (checkable) -- supports 4th "mixed state"
   bool GetAriaTristate(const char* attr_name,
                        bool* is_defined,
                        bool* is_mixed) const;
 
+  virtual base::string16 GetText() const;
+
   // Returns true if the bit corresponding to the given state enum is 1.
   bool HasState(ui::AXState state_enum) const;
 
   // Returns true if this node is an cell or an table header.
   bool IsCellOrTableHeaderRole() const;
 
   // Returns true if the caret is active on this object.
   bool HasCaret() const;
 
-  // Returns true if this node is an editable text field of any kind.
-  bool IsEditableText() const;
-
   // True if this is a web area, and its grandparent is a presentational iframe.
   bool IsWebAreaForPresentationalIframe() const;
 
   bool IsControl() 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();
 
  protected:
   BrowserAccessibility();
 
   // The manager of this tree of accessibility objects.
   BrowserAccessibilityManager* manager_;
 
   // The underlying node.
   ui::AXNode* node_;
 
  private:
+  // |GetInnerText| recursively includes all the text from descendants such as
+  // text found in any embedded object. In contrast, |GetText| might include a
+  // special character in the place of every embedded object instead of its
+  // text, depending on the platform.
   base::string16 GetInnerText() const;
-  int GetInnerTextLength() const;
 
   // If a bounding rectangle is empty, compute it based on the union of its
   // children, since most accessibility APIs don't like elements with no
   // 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::Rect* bounds) const;
 
   // Convert the bounding rectangle of an element (which is relative to
   // its nearest scrollable ancestor) to local bounds (which are relative
   // to the top of the web accessibility tree).
   gfx::Rect ElementBoundsToLocalBounds(gfx::Rect bounds) const;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_