Refactor all accessibility code out of webkit/glue.

content/browser/accessibility/browser_accessibility_manager.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/browser/accessibility/browser_accessibility_manager.h"
 
 #include "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/common/accessibility_messages.h"
 
-using webkit_glue::WebAccessibility;
+using content::AccessibilityNodeData;
 
 BrowserAccessibility* BrowserAccessibilityFactory::Create() {
   return BrowserAccessibility::Create();
 }
 
 // Start child IDs at -1 and decrement each time, because clients use
 // child IDs of 1, 2, 3, ... to access the children of an object by
 // index, so we use negative IDs to clearly distinguish between indices
 // and unique IDs.
 // static
 int32 BrowserAccessibilityManager::next_child_id_ = -1;
 
 #if !defined(OS_MACOSX) && \
     !(defined(OS_WIN) && !defined(USE_AURA)) && \
     !defined(TOOLKIT_GTK)
 // We have subclassess of BrowserAccessibilityManager on Mac, Linux/GTK,
 // and non-Aura Win. For any other platform, instantiate the base class.
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
     gfx::NativeView parent_view,
-    const WebAccessibility& src,
+    const AccessibilityNodeData& src,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory) {
   return new BrowserAccessibilityManager(
       parent_view, src, delegate, factory);
 }
 #endif
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::CreateEmptyDocument(
     gfx::NativeView parent_view,
-    WebAccessibility::State state,
+    AccessibilityNodeData::State state,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory) {
   // Use empty document to process notifications
-  webkit_glue::WebAccessibility empty_document;
+  AccessibilityNodeData empty_document;
   empty_document.id = 0;
-  empty_document.role = WebAccessibility::ROLE_ROOT_WEB_AREA;
-  empty_document.state = state | (1 << WebAccessibility::STATE_READONLY);
+  empty_document.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  empty_document.state = state | (1 << AccessibilityNodeData::STATE_READONLY);
   return BrowserAccessibilityManager::Create(
       parent_view, empty_document, delegate, factory);
 }
 
 BrowserAccessibilityManager::BrowserAccessibilityManager(
     gfx::NativeView parent_view,
-    const WebAccessibility& src,
+    const AccessibilityNodeData& src,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory)
     : parent_view_(parent_view),
       delegate_(delegate),
       factory_(factory),
       focus_(NULL) {
   root_ = CreateAccessibilityTree(NULL, src, 0, false);
   if (!focus_)
     SetFocus(root_, false);
 }
@@ skipping 164 matching lines @@
   }
 }
 
 gfx::Rect BrowserAccessibilityManager::GetViewBounds() {
   if (delegate_)
     return delegate_->GetViewBounds();
   return gfx::Rect();
 }
 
 void BrowserAccessibilityManager::UpdateNode(
-    const WebAccessibility& src,
+    const AccessibilityNodeData& src,
     bool include_children) {
   BrowserAccessibility* current = NULL;
 
   // Look for the node to replace. Either we're replacing the whole tree
   // (role is ROOT_WEB_AREA) or we look it up based on its renderer ID.
-  if (src.role == WebAccessibility::ROLE_ROOT_WEB_AREA) {
+  if (src.role == AccessibilityNodeData::ROLE_ROOT_WEB_AREA) {
     current = root_;
   } else {
     base::hash_map<int32, int32>::iterator iter =
         renderer_id_to_child_id_map_.find(src.id);
     if (iter != renderer_id_to_child_id_map_.end()) {
       int32 child_id = iter->second;
       current = GetFromChildID(child_id);
     }
   }
 
@@ skipping 40 matching lines @@
   if (focus_ && focus_->ref_count() == 1) {
     SetFocus(root_, false);
 
     if (delegate_ && delegate_->HasFocus())
       NotifyAccessibilityEvent(AccessibilityNotificationBlur, focus_);
   }
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::CreateAccessibilityTree(
     BrowserAccessibility* parent,
-    const WebAccessibility& src,
+    const AccessibilityNodeData& src,
     int index_in_parent,
     bool send_show_events) {
   BrowserAccessibility* instance = NULL;
   int32 child_id = 0;
   bool children_can_send_show_events = send_show_events;
   base::hash_map<int32, int32>::iterator iter =
       renderer_id_to_child_id_map_.find(src.id);
 
   // If a BrowserAccessibility instance for this ID already exists, add a
   // new reference to it and retrieve its children vector.
@@ skipping 25 matching lines @@
     // Otherwise, create a new instance.
     instance = factory_->Create();
     child_id = GetNextChildID();
     children_can_send_show_events = false;
   }
 
   instance->PreInitialize(this, parent, child_id, index_in_parent, src);
   child_id_map_[child_id] = instance;
   renderer_id_to_child_id_map_[src.id] = child_id;
 
-  if ((src.state >> WebAccessibility::STATE_FOCUSED) & 1)
+  if ((src.state >> AccessibilityNodeData::STATE_FOCUSED) & 1)
     SetFocus(instance, false);
 
   for (int i = 0; i < static_cast<int>(src.children.size()); ++i) {
     BrowserAccessibility* child = CreateAccessibilityTree(
         instance, src.children[i], i, children_can_send_show_events);
     instance->AddChild(child);
   }
 
-  if (src.role == WebAccessibility::ROLE_ROOT_WEB_AREA)
+  if (src.role == AccessibilityNodeData::ROLE_ROOT_WEB_AREA)
     root_ = instance;
 
   // Note: the purpose of send_show_events and children_can_send_show_events
   // is so that we send a single ObjectShow event for the root of a subtree
   // that just appeared for the first time, but not on any descendant of
   // that subtree.
   if (send_show_events)
     NotifyAccessibilityEvent(AccessibilityNotificationObjectShow, instance);
 
   instance->PostInitialize();
 
   return instance;
 }