Refactor all accessibility code out of webkit/glue.

content/renderer/renderer_accessibility_complete.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_RENDERER_RENDERER_ACCESSIBILITY_COMPLETE_H_
 #define CONTENT_RENDERER_RENDERER_ACCESSIBILITY_COMPLETE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/weak_ptr.h"
+#include "content/common/accessibility_node_data.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/renderer_accessibility.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h"
 
 class RenderViewImpl;
 
 namespace WebKit {
 class WebAccessibilityObject;
 class WebDocument;
 class WebNode;
 };
 
-namespace webkit_glue {
-struct WebAccessibility;
-};
-
 namespace content {
 
 // This is the subclass of RendererAccessibility that implements
 // complete accessibility support for assistive technology (as opposed to
 // partial support - see RendererAccessibilityFocusOnly).
 //
 // This version turns on WebKit's accessibility code and sends
 // a serialized representation of that tree whenever it changes. It also
 // handles requests from the browser to perform accessibility actions on
 // nodes in the tree (e.g., change focus, or click on a button).
@@ skipping 26 matching lines @@
     ~BrowserTreeNode() {}
     int32 id;
     std::vector<BrowserTreeNode*> children;
   };
 
   // Send queued notifications from the renderer to the browser.
   void SendPendingAccessibilityNotifications();
 
   // Update our representation of what nodes the browser has, given a
   // tree of nodes.
-  void UpdateBrowserTree(const webkit_glue::WebAccessibility& renderer_node);
+  void UpdateBrowserTree(const AccessibilityNodeData& renderer_node);
 
   // Clear the given node and recursively delete all of its descendants
   // from the browser tree. (Does not delete |browser_node|).
   void ClearBrowserTreeNode(BrowserTreeNode* browser_node);
 
   // Handlers for messages from the browser to the renderer.
   void OnDoDefaultAction(int acc_obj_id);
   void OnNotificationsAck();
   void OnChangeScrollPosition(int acc_obj_id, int scroll_x, int scroll_y);
   void OnScrollToMakeVisible(int acc_obj_id, gfx::Rect subfocus);
   void OnScrollToPoint(int acc_obj_id, gfx::Point point);
   void OnSetFocus(int acc_obj_id);
 
   void OnSetTextSelection(int acc_obj_id, int start_offset, int end_offset);
 
   // Whether or not this notification typically needs to send
   // updates to its children, too.
   bool ShouldIncludeChildren(
       const AccessibilityHostMsg_NotificationParams& notification);
 
   // Checks if a WebKit accessibility object is an editable text node.
   bool IsEditableText(const WebKit::WebAccessibilityObject& node);
 
   // Recursively explore the tree of WebKit accessibility objects rooted
   // at |src|, and for each editable text node encountered, add a
   // corresponding WebAccessibility node as a child of |dst|.
   void RecursiveAddEditableTextNodesToTree(
       const WebKit::WebAccessibilityObject& src,
-      webkit_glue::WebAccessibility* dst);
+      AccessibilityNodeData* dst);
 
-  // Build a tree of serializable WebAccessibility nodes to send to the
+  // Build a tree of serializable AccessibilityNodeData nodes to send to the
   // browser process, given a WebAccessibilityObject node from WebKit.
   // Modifies |dst| in-place, it's assumed to be empty.
   void BuildAccessibilityTree(const WebKit::WebAccessibilityObject& src,
                               bool include_children,
-                              webkit_glue::WebAccessibility* dst);
+                              AccessibilityNodeData* dst);
 
   // So we can queue up tasks to be executed later.
   base::WeakPtrFactory<RendererAccessibilityComplete> weak_factory_;
 
   // Notifications from WebKit are collected until they are ready to be
   // sent to the browser.
   std::vector<AccessibilityHostMsg_NotificationParams> pending_notifications_;
 
   // Our representation of the browser tree.
   BrowserTreeNode* browser_root_;
@@ skipping 14 matching lines @@
 
   // True if verbose logging of accessibility events is on.
   bool logging_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityComplete);
 };
 
 #endif  // CONTENT_RENDERER_RENDERER_ACCESSIBILITY_COMPLETE_H_
 
 }  // namespace content