Split accessible bounds calculation into two methods for Mac & Win

content/browser/accessibility/browser_accessibility.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.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
@@ skipping 108 matching lines @@
 BrowserAccessibility* BrowserAccessibility::GetNextSibling() {
   if (parent_ &&
       index_in_parent_ >= 0 &&
       index_in_parent_ < static_cast<int>(parent_->children_.size() - 1)) {
     return parent_->children_[index_in_parent_ + 1];
   }
 
   return NULL;
 }
 
-gfx::Rect BrowserAccessibility::GetBoundsRect() {
+gfx::Rect BrowserAccessibility::GetLocalBoundsRect() {
   gfx::Rect bounds = location_;
 
-  // Adjust the bounds by the top left corner of the containing view's bounds
-  // in screen coordinates.
-  gfx::Point top_left = manager_->GetViewBounds().origin();
-  bounds.Offset(top_left);
-
   // Adjust top left position by the root document's scroll offset.
   BrowserAccessibility* root = manager_->GetRoot();
   int scroll_x = 0;
   int scroll_y = 0;
   root->GetIntAttribute(WebAccessibility::ATTR_DOC_SCROLLX, &scroll_x);
   root->GetIntAttribute(WebAccessibility::ATTR_DOC_SCROLLY, &scroll_y);
   bounds.Offset(-scroll_x, -scroll_y);
 
   return bounds;
 }
 
+gfx::Rect BrowserAccessibility::GetGlobalBoundsRect() {
+  gfx::Rect bounds = GetLocalBoundsRect();
+
+  // Adjust the bounds by the top left corner of the containing view's bounds
+  // in screen coordinates.
+  gfx::Point top_left = manager_->GetViewBounds().origin();
+  bounds.Offset(top_left);
+
+  return bounds;
+}
+
 BrowserAccessibility* BrowserAccessibility::BrowserAccessibilityForPoint(
     const gfx::Point& point) {
   // Walk the children recursively looking for the BrowserAccessibility that
   // most tightly encloses the specified point.
   for (int i = children_.size() - 1; i >= 0; --i) {
     BrowserAccessibility* child = children_[i];
-    if (child->GetBoundsRect().Contains(point))
+    if (child->GetGlobalBoundsRect().Contains(point))
       return child->BrowserAccessibilityForPoint(point);
   }
   return this;
 }
 
 void BrowserAccessibility::InternalAddReference() {
   ref_count_++;
 }
 
 void BrowserAccessibility::InternalReleaseReference(bool recursive) {
@@ skipping 95 matching lines @@
   if (!name_.empty()) {
     return name_;
   }
 
   string16 result;
   for (size_t i = 0; i < children_.size(); ++i)
     result += children_[i]->GetTextRecursive();
   return result;
 }