Keep track of accessibility focus across windows.

components/test_runner/accessibility_controller.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 "components/test_runner/accessibility_controller.h"
 
 #include "base/macros.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
+#include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace test_runner {
 
 class AccessibilityControllerBindings
     : public gin::Wrappable<AccessibilityControllerBindings> {
@@ skipping 112 matching lines @@
 }
 
 AccessibilityController::AccessibilityController()
     : log_accessibility_events_(false),
       weak_factory_(this) {
 }
 
 AccessibilityController::~AccessibilityController() {}
 
 void AccessibilityController::Reset() {
-  root_element_ = blink::WebAXObject();
-  focused_element_ = blink::WebAXObject();
   elements_.Clear();
   notification_callback_.Reset();
   log_accessibility_events_ = false;
 }
 
 void AccessibilityController::Install(blink::WebFrame* frame) {
   frame->view()->settings()->setAccessibilityEnabled(true);
   frame->view()->settings()->setInlineTextBoxAccessibilityEnabled(true);
 
   AccessibilityControllerBindings::Install(weak_factory_.GetWeakPtr(), frame);
 }
 
-void AccessibilityController::SetFocusedElement(
-    const blink::WebAXObject& focused_element) {
-  focused_element_ = focused_element;
-}
-
 bool AccessibilityController::ShouldLogAccessibilityEvents() {
   return log_accessibility_events_;
 }
 
 void AccessibilityController::NotificationReceived(
     const blink::WebAXObject& target, const std::string& notification_name) {
   v8::Isolate* isolate = blink::mainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
 
   blink::WebFrame* frame = web_view_->mainFrame();
@@ skipping 49 matching lines @@
     v8::Local<v8::Function> callback) {
   v8::Isolate* isolate = blink::mainThreadIsolate();
   notification_callback_.Reset(isolate, callback);
 }
 
 void AccessibilityController::UnsetNotificationListener() {
   notification_callback_.Reset();
 }
 
 v8::Local<v8::Object> AccessibilityController::FocusedElement() {
-  if (focused_element_.isNull())
-    focused_element_ = web_view_->accessibilityObject();
-  return elements_.GetOrCreate(focused_element_);
+  blink::WebFrame* frame = web_view_->mainFrame();
+  if (!frame)
+    return v8::Local<v8::Object>();
+
+  blink::WebAXObject focused_element =
+      frame->document().focusedAccessibilityObject();
+  if (focused_element.isNull())
+    focused_element = web_view_->accessibilityObject();
+  return elements_.GetOrCreate(focused_element);
 }
 
 v8::Local<v8::Object> AccessibilityController::RootElement() {
-  if (root_element_.isNull())
-    root_element_ = web_view_->accessibilityObject();
-  return elements_.GetOrCreate(root_element_);
+  blink::WebAXObject root_element = web_view_->accessibilityObject();
+  return elements_.GetOrCreate(root_element);
 }
 
 v8::Local<v8::Object>
 AccessibilityController::AccessibleElementById(const std::string& id) {
-  if (root_element_.isNull())
-    root_element_ = web_view_->accessibilityObject();
+  blink::WebAXObject root_element = web_view_->accessibilityObject();
 
-  if (!root_element_.updateLayoutAndCheckValidity())
+  if (!root_element.updateLayoutAndCheckValidity())
     return v8::Local<v8::Object>();
 
   return FindAccessibleElementByIdRecursive(
-      root_element_, blink::WebString::fromUTF8(id.c_str()));
+      root_element, blink::WebString::fromUTF8(id.c_str()));
 }
 
 v8::Local<v8::Object>
 AccessibilityController::FindAccessibleElementByIdRecursive(
     const blink::WebAXObject& obj, const blink::WebString& id) {
   if (obj.isNull() || obj.isDetached())
     return v8::Local<v8::Object>();
 
   blink::WebNode node = obj.node();
   if (!node.isNull() && node.isElementNode()) {
     blink::WebElement element = node.to<blink::WebElement>();
     element.getAttribute("id");
     if (element.getAttribute("id") == id)
       return elements_.GetOrCreate(obj);
   }
 
   unsigned childCount = obj.childCount();
   for (unsigned i = 0; i < childCount; i++) {
     v8::Local<v8::Object> result =
         FindAccessibleElementByIdRecursive(obj.childAt(i), id);
     if (*result)
       return result;
   }
 
   return v8::Local<v8::Object>();
 }
 
 }  // namespace test_runner