First step to move common accessibility code out of content.

content/public/common/ax_node_data.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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_COMMON_ACCESSIBILITY_NODE_DATA_H_
-#define CONTENT_COMMON_ACCESSIBILITY_NODE_DATA_H_
+#ifndef CONTENT_PUBLIC_COMMON_AX_NODE_DATA_H_
+#define CONTENT_PUBLIC_COMMON_AX_NODE_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "ui/gfx/rect.h"
 
 namespace content {
 
 // A compact representation of the accessibility information for a
 // single web object, in a form that can be serialized and sent from
 // the renderer process to the browser process.

[David Tseng, 2013/11/11 18:43:51]

"from a source process to a receiver process" (since the extension process is
technically a renderer, we will be sending browser process -> renderer process).

[dmazzoni, 2013/11/12 00:03:04]

Done.

-struct CONTENT_EXPORT AccessibilityNodeData {
+struct CONTENT_EXPORT AXNodeData {
   // Additional optional attributes that can be optionally attached to
   // a node.
   enum StringAttribute {
     // Document attributes.
     ATTR_DOC_URL,
     ATTR_DOC_TITLE,
     ATTR_DOC_MIMETYPE,
     ATTR_DOC_DOCTYPE,
 
     // Attributes that could apply to any node.
@@ skipping 124 matching lines @@
     // within the object's bounds, the second offset is the right coordinate
     // of the second character, and so on.
     ATTR_CHARACTER_OFFSETS,
 
     // For inline text. These int lists must be the same size; they represent
     // the start and end character index of each word within this text.
     ATTR_WORD_STARTS,
     ATTR_WORD_ENDS,
   };
 
-  AccessibilityNodeData();
-  virtual ~AccessibilityNodeData();
+  AXNodeData();
+  virtual ~AXNodeData();
 
   void AddStringAttribute(StringAttribute attribute,
                           const std::string& value);
   void AddIntAttribute(IntAttribute attribute, int value);
   void AddFloatAttribute(FloatAttribute attribute, float value);
   void AddBoolAttribute(BoolAttribute attribute, bool value);
   void AddIntListAttribute(IntListAttribute attribute,
                            const std::vector<int32>& value);
 
   // Convenience functions, mainly for writing unit tests.
   // Equivalent to AddStringAttribute(ATTR_NAME, name).
   void SetName(std::string name);
   // Equivalent to AddStringAttribute(ATTR_VALUE, value).
   void SetValue(std::string value);
 
-  #ifndef NDEBUG
-  virtual std::string DebugString(bool recursive) const;
-  #endif
-
   // This is a simple serializable struct. All member variables should be
   // public and copyable.
   int32 id;
   WebKit::WebAXRole role;
   uint32 state;
   gfx::Rect location;
   std::vector<std::pair<StringAttribute, std::string> > string_attributes;
   std::vector<std::pair<IntAttribute, int32> > int_attributes;
   std::vector<std::pair<FloatAttribute, float> > float_attributes;
   std::vector<std::pair<BoolAttribute, bool> > bool_attributes;
   std::vector<std::pair<IntListAttribute, std::vector<int32> > >
       intlist_attributes;
   std::vector<std::pair<std::string, std::string> > html_attributes;
   std::vector<int32> child_ids;
 };
 
-// For testing and debugging only: this subclass of AccessibilityNodeData
-// is used to represent a whole tree of accessibility nodes, where each
-// node owns its children. This makes it easy to print the tree structure
-// or search it recursively.
-struct CONTENT_EXPORT AccessibilityNodeDataTreeNode
-    : public AccessibilityNodeData {
-  AccessibilityNodeDataTreeNode();
-  virtual ~AccessibilityNodeDataTreeNode();
-
-  AccessibilityNodeDataTreeNode& operator=(const AccessibilityNodeData& src);
-
-  #ifndef NDEBUG
-  virtual std::string DebugString(bool recursive) const OVERRIDE;
-  #endif
-
-  std::vector<AccessibilityNodeDataTreeNode> children;
-};
-
-// Given a vector of accessibility nodes that represent a complete
-// accessibility tree, where each node appears before its children,
-// build a tree of AccessibilityNodeDataTreeNode objects for easier
-// testing and debugging, where each node contains its children.
-// The |dst| argument will become the root of the new tree.
-void MakeAccessibilityNodeDataTree(
-    const std::vector<AccessibilityNodeData>& src,
-    AccessibilityNodeDataTreeNode* dst);
-
 }  // namespace content
 
-#endif  // CONTENT_COMMON_ACCESSIBILITY_NODE_DATA_H_
+#endif  // CONTENT_PUBLIC_COMMON_AX_NODE_DATA_H_