Refactor all accessibility code out of webkit/glue.

content/common/accessibility_node_data.h

Index: content/common/accessibility_node_data.h
diff --git a/webkit/glue/webaccessibility.h b/content/common/accessibility_node_data.h
similarity index 80%
rename from webkit/glue/webaccessibility.h
rename to content/common/accessibility_node_data.h
index dfe1b4440b3580fd2eed9cd9b458334b2614f47e..8118f897c16081033e5fc799194147c624872b54 100644
--- a/webkit/glue/webaccessibility.h
+++ b/content/common/accessibility_node_data.h
@@ -2,27 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_WEBACCESSIBILITY_H_
-#define WEBKIT_GLUE_WEBACCESSIBILITY_H_
+#ifndef CONTENT_COMMON_ACCESSIBILITY_NODE_DATA_H_
+#define CONTENT_COMMON_ACCESSIBILITY_NODE_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
+#include "content/common/content_export.h"
 #include "ui/gfx/rect.h"
-#include "webkit/glue/webkit_glue_export.h"
 
-namespace WebKit {
-class WebAccessibilityObject;
-}
-
-namespace webkit_glue {
+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.
-struct WEBKIT_GLUE_EXPORT WebAccessibility {
+struct CONTENT_EXPORT AccessibilityNodeData {
  public:

[jam, 2012/06/12 00:00:42]

nit: unnecessary

[dmazzoni, 2012/06/12 18:35:33]

Done.

   // An enumeration of accessibility roles.
   enum Role {
@@ -250,47 +246,16 @@ struct WEBKIT_GLUE_EXPORT WebAccessibility {
     ATTR_CAN_SET_VALUE,
   };
 
-  enum IncludeChildren {
-    NO_CHILDREN,
-    INCLUDE_CHILDREN
-  };
-
-  enum IncludeLineBreaks {
-    NO_LINE_BREAKS,
-    INCLUDE_LINE_BREAKS
-  };
-
-  // Empty constructor, for serialization.
-  WebAccessibility();
-
-  // Construct from a WebAccessibilityObject. Recursively creates child
-  // nodes as needed to complete the tree.
-  WebAccessibility(const WebKit::WebAccessibilityObject& src,
-                   IncludeChildren include_children,
-                   IncludeLineBreaks include_line_breaks);
-
-  ~WebAccessibility();
-
-  // Initialize an already-created struct, same as the constructor above.
-  void Init(const WebKit::WebAccessibilityObject& src,
-            IncludeChildren include_children,
-            IncludeLineBreaks include_line_breaks);
+  AccessibilityNodeData();
+  ~AccessibilityNodeData();
 
 #ifndef NDEBUG
   std::string DebugString(bool recursive) const;
 #endif
 
- private:
-  // Returns true if |ancestor| is the first unignored parent of |child|,
-  // which means that when walking up the parent chain from |child|,
-  // |ancestor| is the *first* ancestor that isn't marked as
-  // accessibilityIsIgnored().
-  bool IsParentUnignoredOf(const WebKit::WebAccessibilityObject& ancestor,
-                           const WebKit::WebAccessibilityObject& child);
-
  public:

[jam, 2012/06/12 00:00:42]

ditto

[dmazzoni, 2012/06/12 18:35:33]

Done.

   // This is a simple serializable struct. All member variables should be
-  // copyable.
+  // public and copyable.
   int32 id;
   string16 name;
   string16 value;
@@ -301,7 +266,7 @@ struct WEBKIT_GLUE_EXPORT WebAccessibility {
   std::map<IntAttribute, int32> int_attributes;
   std::map<FloatAttribute, float> float_attributes;
   std::map<BoolAttribute, bool> bool_attributes;
-  std::vector<WebAccessibility> children;
+  std::vector<AccessibilityNodeData> children;
   std::vector<int32> indirect_child_ids;
   std::vector<std::pair<string16, string16> > html_attributes;
   std::vector<int32> line_breaks;
@@ -316,6 +281,6 @@ struct WEBKIT_GLUE_EXPORT WebAccessibility {
   std::vector<int32> unique_cell_ids;
 };
 
-}  // namespace webkit_glue
+}  // namespace content
 
-#endif  // WEBKIT_GLUE_WEBACCESSIBILITY_H_
+#endif  // CONTENT_COMMON_ACCESSIBILITY_NODE_DATA_H_