Use relative bounding boxes throughout Chrome accessibility

content/browser/accessibility/browser_accessibility.h

Index: content/browser/accessibility/browser_accessibility.h
diff --git a/content/browser/accessibility/browser_accessibility.h b/content/browser/accessibility/browser_accessibility.h
index a72e562975e15ae7d60dde26bfa821877389d4bb..8192a195e90a3811c168c35cd7ff736f748ecdfe 100644
--- a/content/browser/accessibility/browser_accessibility.h
+++ b/content/browser/accessibility/browser_accessibility.h
@@ -143,21 +143,24 @@ class CONTENT_EXPORT BrowserAccessibility {
   // Returns nullptr if there are no children.
   BrowserAccessibility* InternalDeepestLastChild() const;
 
+  // Returns the bounds of this object in coordinates relative to this frame.
+  gfx::Rect GetFrameBoundsRect() const;
+
   // Returns the bounds of this object in coordinates relative to the
-  // top-left corner of the overall web area.
-  gfx::Rect GetLocalBoundsRect() const;
+  // page (specifically, the top-left corner of the topmost web contents).
+  gfx::Rect GetPageBoundsRect() const;
 
   // Returns the bounds of this object in screen coordinates.
-  gfx::Rect GetGlobalBoundsRect() const;
+  gfx::Rect GetScreenBoundsRect() const;
 
   // Returns the bounds of the given range in coordinates relative to the
   // top-left corner of the overall web area. Only valid when the
   // role is WebAXRoleStaticText.
-  gfx::Rect GetLocalBoundsForRange(int start, int len) const;
+  gfx::Rect GetPageBoundsForRange(int start, int len) const;
 
-  // Same as GetLocalBoundsForRange, in screen coordinates. Only valid when
+  // Same as GetPageBoundsForRange, in screen coordinates. Only valid when
   // the role is WebAXRoleStaticText.
-  gfx::Rect GetGlobalBoundsForRange(int start, int len) const;
+  gfx::Rect GetScreenBoundsForRange(int start, int len) const;
 
   // This is to handle the cases such as ARIA textbox, where the value should
   // be calculated from the object's inner text.
@@ -225,7 +228,7 @@ class CONTENT_EXPORT BrowserAccessibility {
 
   int32_t GetId() const;
   const ui::AXNodeData& GetData() const;
-  gfx::Rect GetLocation() const;
+  gfx::RectF GetLocation() const;
   int32_t GetRole() const;
   int32_t GetState() const;
 
@@ -364,12 +367,13 @@ class CONTENT_EXPORT BrowserAccessibility {
   // 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;
+  void FixEmptyBounds(gfx::RectF* 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;
+  // its nearest scrollable ancestor) to absolute bounds, either in
+  // page coordinates (when |frameOnly| is false), or in frame coordinates
+  // (when |frameOnly| is true).
+  gfx::Rect RelativeToAbsoluteBounds(gfx::RectF bounds, bool frame_only) const;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };