Fix accessibility coordinates within iframes.

content/browser/accessibility/dump_accessibility_tree_helper_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/dump_accessibility_tree_helper.h"
 
 #include <oleacc.h>
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/common/accessibility_node_data.h"
 #include "content/public/test/accessibility_test_utils_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/base/win/atl_module.h"
 
 namespace content {
 
 void DumpAccessibilityTreeHelper::Initialize() {
@@ skipping 68 matching lines @@
     Add(false, StringPrintf(L"currentValue=%.2f", V_R8(&currentValue)));
   VARIANT minimumValue;
   if (acc_obj->get_minimumValue(&minimumValue) == S_OK)
     Add(false, StringPrintf(L"minimumValue=%.2f", V_R8(&minimumValue)));
   VARIANT maximumValue;
   if (acc_obj->get_maximumValue(&maximumValue) == S_OK)
     Add(false, StringPrintf(L"maximumValue=%.2f", V_R8(&maximumValue)));
   Add(false, L"description='" + description + L"'");
   Add(false, L"default_action='" + default_action + L"'");
   Add(false, L"keyboard_shortcut='" + keyboard_shortcut + L"'");
-  LONG x_left, y_top, width, height;
-  if (acc_obj->accLocation(&x_left, &y_top, &width, &height, variant_self) !=
-      S_FALSE) {
-    Add(false, StringPrintf(L"location=(%d, %d)", x_left, y_top));
+  BrowserAccessibility* root = node->manager()->GetRoot();
+  LONG left, top, width, height;
+  LONG root_left, root_top, root_width, root_height;
+  if (S_FALSE != acc_obj->accLocation(

[aboxhall, 2013/01/29 17:43:27]

It always makes me sad when APIs force you to use Yoda conditions :(

+          &left, &top, &width, &height, variant_self) &&
+      S_FALSE != root->ToBrowserAccessibilityWin()->accLocation(
+          &root_left, &root_top, &root_width, &root_height, variant_self)) {
+    Add(false, StringPrintf(L"location=(%d, %d)",
+            left - root_left, top - root_top));
     Add(false, StringPrintf(L"size=(%d, %d)", width, height));
   }
   LONG index_in_parent;
   if (acc_obj->get_indexInParent(&index_in_parent) == S_OK)
     Add(false, StringPrintf(L"index_in_parent=%d", index_in_parent));
   LONG n_relations;
   if (acc_obj->get_nRelations(&n_relations) == S_OK)
     Add(false, StringPrintf(L"n_relations=%d", n_relations));
   LONG group_level, similar_items_in_group, position_in_group;
   if (acc_obj->get_groupPosition(&group_level,
@@ skipping 53 matching lines @@
 
 const std::string DumpAccessibilityTreeHelper::GetAllowString() const {
   return "@WIN-ALLOW:";
 }
 
 const std::string DumpAccessibilityTreeHelper::GetDenyString() const {
   return "@WIN-DENY:";
 }
 
 }  // namespace content