Use relative bounding boxes throughout Chrome accessibility

content/browser/accessibility/browser_accessibility_win.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_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 243 matching lines @@
 STDMETHODIMP BrowserAccessibilityWin::accHitTest(LONG x_left,
                                                  LONG y_top,
                                                  VARIANT* child) {
   if (!instance_active())
     return E_FAIL;
 
   if (!child)
     return E_INVALIDARG;
 
   gfx::Point point(x_left, y_top);
-  if (!GetGlobalBoundsRect().Contains(point)) {
+  if (!GetScreenBoundsRect().Contains(point)) {
     // Return S_FALSE and VT_EMPTY when outside the object's boundaries.
     child->vt = VT_EMPTY;
     return S_FALSE;
   }
 
   BrowserAccessibility* result = BrowserAccessibilityForPoint(point);
   if (result == this) {
     // Point is within this object.
     child->vt = VT_I4;
     child->lVal = CHILDID_SELF;
@@ skipping 12 matching lines @@
   if (!instance_active())
     return E_FAIL;
 
   if (!x_left || !y_top || !width || !height)
     return E_INVALIDARG;
 
   BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
-  gfx::Rect bounds = target->GetGlobalBoundsRect();
+  gfx::Rect bounds = target->GetScreenBoundsRect();
   *x_left = bounds.x();
   *y_top  = bounds.y();
   *width  = bounds.width();
   *height = bounds.height();
 
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::accNavigate(LONG nav_dir,
                                                   VARIANT start,
@@ skipping 512 matching lines @@
     relations[i] = relations_[i];
   }
 
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::scrollTo(IA2ScrollType scroll_type) {
   if (!instance_active())
     return E_FAIL;
 
-  gfx::Rect r = GetLocation();
+  gfx::Rect r = GetFrameBoundsRect();
   switch(scroll_type) {
     case IA2_SCROLL_TYPE_TOP_LEFT:
       manager()->ScrollToMakeVisible(*this, gfx::Rect(r.x(), r.y(), 0, 0));
       break;
     case IA2_SCROLL_TYPE_BOTTOM_RIGHT:
       manager()->ScrollToMakeVisible(
           *this, gfx::Rect(r.right(), r.bottom(), 0, 0));
       break;
     case IA2_SCROLL_TYPE_TOP_EDGE:
       manager()->ScrollToMakeVisible(
@@ skipping 27 matching lines @@
     LONG y) {
   if (!instance_active())
     return E_FAIL;
 
   gfx::Point scroll_to(x, y);
 
   if (coordinate_type == IA2_COORDTYPE_SCREEN_RELATIVE) {
     scroll_to -= manager()->GetViewBounds().OffsetFromOrigin();
   } else if (coordinate_type == IA2_COORDTYPE_PARENT_RELATIVE) {
     if (GetParent())
-      scroll_to += GetParent()->GetLocation().OffsetFromOrigin();
+      scroll_to += GetParent()->GetFrameBoundsRect().OffsetFromOrigin();
   } else {
     return E_INVALIDARG;
   }
 
   manager()->ScrollToPoint(*this, scroll_to);
   manager()->ToBrowserAccessibilityManagerWin()->TrackScrollingObject(this);
 
   return S_OK;
 }
 
@@ skipping 144 matching lines @@
     IA2CoordinateType coordinate_type,
     LONG* x,
     LONG* y) {
   if (!instance_active())
     return E_FAIL;
 
   if (!x || !y)
     return E_INVALIDARG;
 
   if (coordinate_type == IA2_COORDTYPE_SCREEN_RELATIVE) {
-    HWND parent_hwnd =
-        manager()->ToBrowserAccessibilityManagerWin()->GetParentHWND();
-    if (!parent_hwnd)
-      return E_FAIL;
-    POINT top_left = {0, 0};
-    ::ClientToScreen(parent_hwnd, &top_left);
-    *x = GetLocation().x() + top_left.x;
-    *y = GetLocation().y() + top_left.y;
+    gfx::Rect bounds = GetScreenBoundsRect();

[aboxhall, 2016/08/12 16:05:10]

Ahhh this is so great.

+    *x = bounds.x();
+    *y = bounds.y();
   } else if (coordinate_type == IA2_COORDTYPE_PARENT_RELATIVE) {
-    *x = GetLocation().x();
-    *y = GetLocation().y();
-    if (GetParent()) {
-      *x -= GetParent()->GetLocation().x();
-      *y -= GetParent()->GetLocation().y();
-    }
+    gfx::Rect bounds = GetPageBoundsRect();
+    gfx::Rect parent_bounds =
+        GetParent() ? GetParent()->GetPageBoundsRect() : gfx::Rect();
+    *x = bounds.x() - parent_bounds.x();
+    *y = bounds.y() - parent_bounds.y();
   } else {
     return E_INVALIDARG;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_imageSize(LONG* height, LONG* width) {
   if (!instance_active())
     return E_FAIL;
 
   if (!height || !width)
     return E_INVALIDARG;
 
-  *height = GetLocation().height();
-  *width = GetLocation().width();
+  *height = GetPageBoundsRect().height();
+  *width = GetPageBoundsRect().width();
   return S_OK;
 }
 
 //
 // IAccessibleTable methods.
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_accessibleAt(
     long row,
     long column,
@@ skipping 920 matching lines @@
     return E_INVALIDARG;
 
   const base::string16& text_str = GetText();
   HandleSpecialTextOffset(text_str, &offset);
 
   if (offset < 0 || offset > static_cast<LONG>(text_str.size()))
     return E_INVALIDARG;
 
   gfx::Rect character_bounds;
   if (coordinate_type == IA2_COORDTYPE_SCREEN_RELATIVE) {
-    character_bounds = GetGlobalBoundsForRange(offset, 1);
+    character_bounds = GetScreenBoundsForRange(offset, 1);
   } else if (coordinate_type == IA2_COORDTYPE_PARENT_RELATIVE) {
-    character_bounds = GetLocalBoundsForRange(offset, 1);
-    character_bounds -= GetLocation().OffsetFromOrigin();
+    character_bounds = GetPageBoundsForRange(offset, 1);
+    if (GetParent())
+      character_bounds -= GetParent()->GetPageBoundsRect().OffsetFromOrigin();
   } else {
     return E_INVALIDARG;
   }
 
   *out_x = character_bounds.x();
   *out_y = character_bounds.y();
   *out_width = character_bounds.width();
   *out_height = character_bounds.height();
 
   return S_OK;
@@ skipping 1060 matching lines @@
 
   if (!out_x || !out_y || !out_width || !out_height)
     return E_INVALIDARG;
 
   unsigned int text_length = static_cast<unsigned int>(GetText().size());
   if (start_index > text_length || end_index > text_length ||
       start_index > end_index) {
     return E_INVALIDARG;
   }
 
-  gfx::Rect bounds = GetGlobalBoundsForRange(
+  gfx::Rect bounds = GetScreenBoundsForRange(
       start_index, end_index - start_index);
   *out_x = bounds.x();
   *out_y = bounds.y();
   *out_width = bounds.width();
   *out_height = bounds.height();
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::scrollToSubstring(
     unsigned int start_index,
     unsigned int end_index) {
   if (!instance_active())
     return E_FAIL;
 
   unsigned int text_length = static_cast<unsigned int>(GetText().size());
   if (start_index > text_length || end_index > text_length ||
       start_index > end_index) {
     return E_INVALIDARG;
   }
 
-  manager()->ScrollToMakeVisible(*this, GetLocalBoundsForRange(
+  manager()->ScrollToMakeVisible(*this, GetPageBoundsForRange(
       start_index, end_index - start_index));
   manager()->ToBrowserAccessibilityManagerWin()->TrackScrollingObject(this);
 
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_fontFamily(BSTR* font_family) {
   if (!font_family)
     return E_INVALIDARG;
   *font_family = nullptr;
@@ skipping 2072 matching lines @@
   return static_cast<BrowserAccessibilityWin*>(obj);
 }
 
 const BrowserAccessibilityWin*
 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) {
   DCHECK(!obj || obj->IsNative());
   return static_cast<const BrowserAccessibilityWin*>(obj);
 }
 
 }  // namespace content