Refactor all accessibility code out of webkit/glue.

content/renderer/renderer_accessibility_complete.cc

 // 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.
 
 #include "content/renderer/renderer_accessibility_complete.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
+#include "content/renderer/accessibility_node_serializer.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/webaccessibility.h"
 
 using WebKit::WebAccessibilityNotification;
 using WebKit::WebAccessibilityObject;
 using WebKit::WebDocument;
 using WebKit::WebFrame;
 using WebKit::WebNode;
 using WebKit::WebPoint;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebView;
-using webkit_glue::WebAccessibility;
 
 namespace content {
 
 bool WebAccessibilityNotificationToAccessibilityNotification(
     WebAccessibilityNotification notification,
     AccessibilityNotification* type) {
   switch (notification) {
     case WebKit::WebAccessibilityNotificationActiveDescendantChanged:
       *type = AccessibilityNotificationActiveDescendantChanged;
       break;
@@ skipping 274 matching lines @@
       }
     }
 
     AccessibilityHostMsg_NotificationParams notification_msg;
     notification_msg.notification_type = notification.notification_type;
     notification_msg.id = notification.id;
     notification_msg.includes_children = includes_children;
     BuildAccessibilityTree(obj, includes_children, &notification_msg.acc_tree);
     if (obj.axID() == root_id) {
       DCHECK_EQ(notification_msg.acc_tree.role,
-                WebAccessibility::ROLE_WEB_AREA);
-      notification_msg.acc_tree.role = WebAccessibility::ROLE_ROOT_WEB_AREA;
+                AccessibilityNodeData::ROLE_WEB_AREA);
+      notification_msg.acc_tree.role =
+          AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
     }
     notification_msgs.push_back(notification_msg);
 
     if (includes_children)
       UpdateBrowserTree(notification_msg.acc_tree);
 
 #ifndef NDEBUG
     if (logging_) {
       LOG(INFO) << "Accessibility update: \n"
           << "routing id=" << routing_id()
           << " notification="
           << AccessibilityNotificationToString(notification.notification_type)
           << "\n" << notification_msg.acc_tree.DebugString(true);
     }
 #endif
   }
 
   Send(new AccessibilityHostMsg_Notifications(routing_id(), notification_msgs));
 }
 
 void RendererAccessibilityComplete::UpdateBrowserTree(
-    const webkit_glue::WebAccessibility& renderer_node) {
+    const AccessibilityNodeData& renderer_node) {
   BrowserTreeNode* browser_node = NULL;
   base::hash_map<int32, BrowserTreeNode*>::iterator iter =
       browser_id_map_.find(renderer_node.id);
   if (iter != browser_id_map_.end()) {
     browser_node = iter->second;
     ClearBrowserTreeNode(browser_node);
   } else {
-    DCHECK_EQ(renderer_node.role, WebAccessibility::ROLE_ROOT_WEB_AREA);
+    DCHECK_EQ(renderer_node.role, AccessibilityNodeData::ROLE_ROOT_WEB_AREA);
     if (browser_root_) {
       ClearBrowserTreeNode(browser_root_);
       browser_id_map_.erase(browser_root_->id);
       delete browser_root_;
     }
     browser_root_ = new BrowserTreeNode;
     browser_node = browser_root_;
     browser_node->id = renderer_node.id;
     browser_id_map_[browser_node->id] = browser_node;
   }
@@ skipping 162 matching lines @@
       type == AccessibilityNotificationLiveRegionChanged ||
       type == AccessibilityNotificationSelectedChildrenChanged) {
     return true;
   }
   return false;
 }
 
 void RendererAccessibilityComplete::BuildAccessibilityTree(
     const WebAccessibilityObject& src,
     bool include_children,
-    WebAccessibility* dst) {
-  dst->Init(src,
-            include_children ?
-            WebAccessibility::INCLUDE_CHILDREN :
-            WebAccessibility::NO_CHILDREN,
-            WebAccessibility::INCLUDE_LINE_BREAKS);
+    AccessibilityNodeData* dst) {
+  AccessibilityNodeSerializer::Serialize(
+      src,
+      dst,
+      include_children ?
+          AccessibilityNodeSerializer::INCLUDE_CHILDREN :
+          AccessibilityNodeSerializer::NO_CHILDREN,
+      AccessibilityNodeSerializer::INCLUDE_LINE_BREAKS);
 }
 
 }  // namespace content