Cross-process iframe accessibility.

content/browser/accessibility/browser_accessibility_manager.h

Index: content/browser/accessibility/browser_accessibility_manager.h
diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h
index 567fa602520555d486b51a714a1c07ab33ad09c1..055ba9f760f085a9039cec6303900383a8333521 100644
--- a/content/browser/accessibility/browser_accessibility_manager.h
+++ b/content/browser/accessibility/browser_accessibility_manager.h
@@ -13,6 +13,7 @@
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/ax_serializable_tree.h"
 #include "ui/accessibility/ax_tree.h"
 #include "ui/accessibility/ax_tree_update.h"
 #include "ui/gfx/native_widget_types.h"
@@ -179,8 +180,12 @@ class CONTENT_EXPORT BrowserAccessibilityManager
 
   BrowserAccessibilityDelegate* delegate() const { return delegate_; }
 
+  // Get a snapshot of the current tree as an AXTreeUpdate.
+  ui::AXTreeUpdate SnapshotAXTreeForTesting();
+
   // Frame tree support.
   void SetParentFrameIds(int parent_frame_frame_id, int parent_frame_node_id);
+  void SetChildFrameId(int node_id, int child_frame_id);
   BrowserAccessibility* GetCrossFrameParent();
 
  protected:
@@ -216,21 +221,6 @@ class CONTENT_EXPORT BrowserAccessibilityManager
     OSK_ALLOWED
   };
 
-  // Update a set of nodes using data received from the renderer
-  // process.
-  bool UpdateNodes(const std::vector<ui::AXNodeData>& nodes);
-
-  // Update one node from the tree using data received from the renderer
-  // process. Returns true on success, false on fatal error.
-  bool UpdateNode(const ui::AXNodeData& src);
-
-  void SetRoot(BrowserAccessibility* root);
-
-  BrowserAccessibility* CreateNode(
-      BrowserAccessibility* parent,
-      int32 id,
-      int32 index_in_parent);
-
  protected:
   // The object that can perform actions on our behalf.
   BrowserAccessibilityDelegate* delegate_;
@@ -239,7 +229,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager
   scoped_ptr<BrowserAccessibilityFactory> factory_;
 
   // The underlying tree of accessibility objects.
-  scoped_ptr<ui::AXTree> tree_;
+  scoped_ptr<ui::AXSerializableTree> tree_;
 
   // The node that currently has focus.
   ui::AXNode* focus_;