Added the selected text marker range to the dictionary for the selection change notification

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>
@@ skipping 154 matching lines @@
   // Notify the accessibility manager about page navigation.
   void UserIsNavigatingAway();
   virtual void UserIsReloading();
   void NavigationSucceeded();
   void NavigationFailed();
 
   // Called to notify the accessibility manager that a mouse down event
   // 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);
+  // Update the focused node to |node|, which may be null.
+  // If |notify| is true, send a message to the renderer to set focus
+  // to this node.
+  void SetFocus(ui::AXNode* node, bool notify);

[Mark Mentovai, 2016/02/19 17:16:16]

Dominic should comment on this.

+  void SetFocus(BrowserAccessibility* node, bool notify);
 
   // 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 51 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.
-  virtual BrowserAccessibility* GetFocus();
+  // Return the object that has focus, if it's a descendant of the
+  // given root (inclusive). Does not make a new reference.
+  virtual BrowserAccessibility* GetFocus(BrowserAccessibility* root);
 
-  // Given a focused node |focus|, returns a descendant of that node if it
-  // has an active descendant, otherwise returns |focus|.
-  BrowserAccessibility* GetActiveDescendantFocus(BrowserAccessibility* focus);
+  // Return the descentant of the given root that has focus, or that object's
+  // active descendant if it has one.
+  BrowserAccessibility* GetActiveDescendantFocus(BrowserAccessibility* root);
 
   // 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();
 
   // Walk the tree.
   static BrowserAccessibility* NextInTreeOrder(
@@ skipping 90 matching lines @@
  protected:
   // The object that can perform actions on our behalf.
   BrowserAccessibilityDelegate* delegate_;
 
   // Factory to create BrowserAccessibility objects (for dependency injection).
   scoped_ptr<BrowserAccessibilityFactory> factory_;
 
   // The underlying tree of accessibility objects.
   scoped_ptr<ui::AXSerializableTree> tree_;
 
+  // The node that currently has focus.
+  ui::AXNode* focus_;

[dmazzoni, 2016/02/19 17:29:24]

This is definitely wrong. I got rid of this in my change yesterday, please
carefully merge your change on top of it and don't add this back.

+
   // A mapping from a node id to its wrapper of type BrowserAccessibility.
   base::hash_map<int32_t, BrowserAccessibility*> id_wrapper_map_;
 
   // True if the user has initiated a navigation to another page.
   bool user_is_navigating_away_;
 
   // The on-screen keyboard state.
   OnScreenKeyboardState osk_state_;
 
   BrowserAccessibilityFindInPageInfo find_in_page_info_;
 
   // The global ID of this accessibility tree.
   AXTreeIDRegistry::AXTreeID ax_tree_id_;
 
   // If this tree has a parent tree, this is the cached ID of the parent
   // 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_