Fix accessibility coordinates within iframes.

content/browser/accessibility/browser_accessibility.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.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 115 matching lines @@
       index_in_parent_ < static_cast<int>(parent_->children_.size() - 1)) {
     return parent_->children_[index_in_parent_ + 1];
   }
 
   return NULL;
 }
 
 gfx::Rect BrowserAccessibility::GetLocalBoundsRect() {
   gfx::Rect bounds = location_;
 
-  // Adjust top left position by the root document's scroll offset.
-  BrowserAccessibility* root = manager_->GetRoot();
-  int scroll_x = 0;
-  int scroll_y = 0;
-  if (!root->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X, &scroll_x) ||
-      !root->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_Y, &scroll_y)) {
-    return bounds;
+  // Walk up the parent chain. Every time we encounter a Web Area, offset
+  // based on the scroll bars and then offset based on the origin of that
+  // nested web area.
+  BrowserAccessibility* parent = parent_;
+  bool need_to_offset_web_area =
+      (role_ == AccessibilityNodeData::ROLE_WEB_AREA);
+  while (parent) {
+    if (need_to_offset_web_area &&
+        parent->location().width() > 0 &&
+        parent->location().height() > 0) {
+      bounds.Offset(parent->location().x(), parent->location().y());
+      need_to_offset_web_area = false;
+    }
+    if (parent->role() == AccessibilityNodeData::ROLE_WEB_AREA) {
+      int sx = 0;
+      int sy = 0;
+      if (parent->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X, &sx) &&
+          parent->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_Y, &sy)) {
+        bounds.Offset(-sx, -sy);
+      }
+      need_to_offset_web_area = true;
+    }
+    parent = parent->parent();
   }
-  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.
   bounds.Offset(manager_->GetViewBounds().OffsetFromOrigin());
@@ skipping 160 matching lines @@
   for (size_t i = 0; i < children_.size(); ++i)
     result += children_[i]->GetTextRecursive();
   return result;
 }
 
 void BrowserAccessibility::PreInitialize() {
   instance_active_ = true;
 }
 
 }  // namespace content