Implement initial support for nesting one ax tree in another.

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 <vector>
 
 #include "base/containers/hash_tables.h"
@@ skipping 51 matching lines @@
 class CONTENT_EXPORT BrowserAccessibilityFactory {
  public:
   virtual ~BrowserAccessibilityFactory() {}
 
   // Create an instance of BrowserAccessibility and return a new
   // reference to it.
   virtual BrowserAccessibility* Create();
 };
 
 // Manages a tree of BrowserAccessibility objects.
-class CONTENT_EXPORT BrowserAccessibilityManager : public ui::AXTreeDelegate {
+class CONTENT_EXPORT BrowserAccessibilityManager
+    : public ui::AXTreeDelegate {

[David Tseng, 2014/05/01 18:07:54]

nit: why was this changed? I think it still fits on the previous line.

[dmazzoni, 2014/05/05 07:17:57]

Accident. Thanks.

  public:
   // Creates the platform-specific BrowserAccessibilityManager, but
   // with no parent window pointer. Only useful for unit tests.
   static BrowserAccessibilityManager* Create(
       const ui::AXTreeUpdate& initial_tree,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
   virtual ~BrowserAccessibilityManager();
 
@@ skipping 88 matching lines @@
   BrowserAccessibility* PreviousInTreeOrder(BrowserAccessibility* node);
 
   // AXTreeDelegate implementation.
   virtual void OnNodeWillBeDeleted(ui::AXNode* node) OVERRIDE;
   virtual void OnNodeCreated(ui::AXNode* node) OVERRIDE;
   virtual void OnNodeChanged(ui::AXNode* node) OVERRIDE;
   virtual void OnNodeCreationFinished(ui::AXNode* node) OVERRIDE;
   virtual void OnNodeChangeFinished(ui::AXNode* node) OVERRIDE;
   virtual void OnRootChanged(ui::AXNode* new_root) OVERRIDE {}
 
+  BrowserAccessibilityDelegate* delegate() const { return delegate_; }
+
+  // Frame tree support.
+  void SetParentFrameIds(int parent_frame_frame_id, int parent_frame_node_id);
+  BrowserAccessibility* GetCrossFrameParent();
+
  protected:
   BrowserAccessibilityManager(
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
   BrowserAccessibilityManager(
       const ui::AXTreeUpdate& initial_tree,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
@@ skipping 44 matching lines @@
 
   // The underlying tree of accessibility objects.
   scoped_ptr<ui::AXTree> tree_;
 
   // The node that currently has focus.
   ui::AXNode* focus_;
 
   // A mapping from a node id to its wrapper of type BrowserAccessibility.
   base::hash_map<int32, BrowserAccessibility*> id_wrapper_map_;
 
+  // The id of the parent frame and the hosting node within the parent frame.
+  // The parent frame id can be mapped to another BrowserAccessibilityManager
+  // using FrameTreeAccessibility.
+  int32 parent_frame_frame_id_;

[David Tseng, 2014/05/01 18:07:54]

I would split this comment into separate ones for each field since they are ids
for different set of objects.

[dmazzoni, 2014/05/05 07:17:57]

Done.

+  int32 parent_frame_node_id_;
+
   // The on-screen keyboard state.
   OnScreenKeyboardState osk_state_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_