Account for device scale factor in automation API bounding boxes.

chrome/renderer/extensions/automation_internal_custom_bindings.cc

 // Copyright 2014 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 "chrome/renderer/extensions/automation_internal_custom_bindings.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
+#include "chrome/common/extensions/api/automation_api_constants.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "chrome/common/extensions/manifest_handlers/automation.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/renderer/script_context.h"
 #include "ipc/message_filter.h"
 #include "ui/accessibility/ax_enums.h"
@@ skipping 116 matching lines @@
     int scroll_x = 0;
     int scroll_y = 0;
     if (container->data().GetIntAttribute(ui::AX_ATTR_SCROLL_X, &scroll_x) &&
         container->data().GetIntAttribute(ui::AX_ATTR_SCROLL_Y, &scroll_y)) {
       bounds.Offset(-scroll_x, -scroll_y);
     }
 
     node = container;
   }
 
+  // All trees other than the desktop tree are scaled by the device
+  // scale factor. Unscale them so they're all in consistent units.
+  if (cache->tree_id != api::automation::kDesktopTreeID) {
+    float scale_factor = cache->owner->context()
+                             ->GetRenderFrame()
+                             ->GetRenderView()
+                             ->GetDeviceScaleFactor();
+    if (scale_factor > 0)
+      bounds.Scale(1.0 / scale_factor);
+  }
+
   return gfx::ToEnclosingRect(bounds);
 }
 
 ui::AXNode* FindNodeWithChildTreeId(ui::AXNode* node, int child_tree_id) {
   if (child_tree_id == node->data().GetIntAttribute(ui::AX_ATTR_CHILD_TREE_ID))
     return node;
 
   for (int i = 0; i < node->child_count(); ++i) {
     ui::AXNode* result =
         FindNodeWithChildTreeId(node->ChildAtIndex(i), child_tree_id);
@@ skipping 1222 matching lines @@
   v8::Local<v8::Array> args(v8::Array::New(GetIsolate(), 2U));
   args->Set(0U, v8::Integer::New(GetIsolate(), tree_id));
   v8::Local<v8::Array> nodes(v8::Array::New(GetIsolate(), ids.size()));
   args->Set(1U, nodes);
   for (size_t i = 0; i < ids.size(); ++i)
     nodes->Set(i, v8::Integer::New(GetIsolate(), ids[i]));
   context()->DispatchEvent("automationInternal.onNodesRemoved", args);
 }
 
 }  // namespace extensions