Split accessible bounds calculation into two methods for Mac & Win

content/browser/accessibility/browser_accessibility_win.cc

 // Copyright (c) 2011 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 "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
@@ skipping 189 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 (!GetBoundsRect().Contains(point)) {
+  if (!GetGlobalBoundsRect().Contains(point)) {
     // Return S_FALSE and VT_EMPTY when the 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 10 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->GetBoundsRect();
+  gfx::Rect bounds = target->GetGlobalBoundsRect();
   *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, VARIANT* end) {
@@ skipping 2714 matching lines @@
   }
 
   // The role should always be set.
   DCHECK(!role_name_.empty() || ia_role_);
 
   // If we didn't explicitly set the IAccessible2 role, make it the same
   // as the MSAA role.
   if (!ia2_role_)
     ia2_role_ = ia_role_;
 }