Fix WebView accessibility

content/browser/accessibility/browser_accessibility_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 
 #include <stdint.h>
 
 #include <vector>
 
+#include "base/callback_forward.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/ax_tree_id_registry.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_serializable_tree.h"
@@ skipping 162 matching lines @@
   // occurred in the tab.
   void GotMouseDown();
 
   // Send a message to the renderer to set focus to this node.
   void SetFocus(const BrowserAccessibility& node);
 
   // Pretend that the given node has focus, for testing only. Doesn't
   // communicate with the renderer and doesn't fire any events.
   void SetFocusLocallyForTesting(BrowserAccessibility* node);
 
+  // For testing only, register a function to be called when focus changes
+  // in any BrowserAccessibilityManager.
+  static void SetFocusChangeCallbackForTesting(base::Closure callback);

[dcheng, 2016/03/24 18:15:11]

const base::Closure&

(base::Closure is movable now, but I think in general, we still prefer to pass
by const T& unless there's some clear win for passing by value and using move
semantics)

[dmazzoni, 2016/03/25 05:02:22]

Done.

+
   // Tell the renderer to do the default action for this node.
   void DoDefaultAction(const BrowserAccessibility& node);
 
   // Tell the renderer to scroll to make |node| visible.
   // In addition, if it's not possible to make the entire object visible,
   // scroll so that the |subfocus| rect is visible at least. The subfocus
   // rect is in local coordinates of the object itself.
   void ScrollToMakeVisible(
       const BrowserAccessibility& node, gfx::Rect subfocus);
 
@@ skipping 50 matching lines @@
 
 #if defined(OS_ANDROID)
   BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid();
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
   BrowserAccessibilityManagerAuraLinux*
       ToBrowserAccessibilityManagerAuraLinux();
 #endif
 
-  // Return the object that has focus.
+  // Return the object that has focus, starting at the top of the frame tree.
   virtual BrowserAccessibility* GetFocus();
 
+  // Return the object that has focus, only considering this frame and
+  // descendants.
+  BrowserAccessibility* GetFocusFromThisOrDescendantFrame();
+
   // Given a focused node |focus|, returns a descendant of that node if it
   // has an active descendant, otherwise returns |focus|.
   BrowserAccessibility* GetActiveDescendantFocus(BrowserAccessibility* focus);
 
   // Returns true if native focus is anywhere in this WebContents or not.
   bool NativeViewHasFocus();
 
   // True by default, but some platforms want to treat the root
   // scroll offsets separately.
   virtual bool UseRootScrollOffsetsWhenComputingBounds();
@@ skipping 131 matching lines @@
   // node within that parent tree. It's computed as needed and cached for
   // speed so that it can be accessed quickly if it hasn't changed.
   int parent_node_id_from_parent_tree_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_