Refactor all accessibility code out of webkit/glue.

content/browser/accessibility/browser_accessibility.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.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/common/accessibility_messages.h"
 
-typedef WebAccessibility::BoolAttribute BoolAttribute;
-typedef WebAccessibility::FloatAttribute FloatAttribute;
-typedef WebAccessibility::IntAttribute IntAttribute;
-typedef WebAccessibility::StringAttribute StringAttribute;
+using content::AccessibilityNodeData;
+
+typedef AccessibilityNodeData::BoolAttribute BoolAttribute;
+typedef AccessibilityNodeData::FloatAttribute FloatAttribute;
+typedef AccessibilityNodeData::IntAttribute IntAttribute;
+typedef AccessibilityNodeData::StringAttribute StringAttribute;
 
 #if !defined(OS_MACOSX) && \
     !(defined(OS_WIN) && !defined(USE_AURA)) && \
     !defined(TOOLKIT_GTK)
 // We have subclassess of BrowserAccessibility on Mac, Linux/GTK,
 // and non-Aura Win. For any other platform, instantiate the base class.
 // static
 BrowserAccessibility* BrowserAccessibility::Create() {
   return new BrowserAccessibility();
 }
@@ skipping 21 matching lines @@
     children_[i]->DetachTree(nodes);
   children_.clear();
   parent_ = NULL;
 }
 
 void BrowserAccessibility::PreInitialize(
     BrowserAccessibilityManager* manager,
     BrowserAccessibility* parent,
     int32 child_id,
     int32 index_in_parent,
-    const webkit_glue::WebAccessibility& src) {
+    const AccessibilityNodeData& src) {
   manager_ = manager;
   parent_ = parent;
   child_id_ = child_id;
   index_in_parent_ = index_in_parent;
 
   // Update all of the rest of the attributes.
   name_ = src.name;
   value_ = src.value;
   role_ = src.role;
   state_ = src.state;
@@ skipping 59 matching lines @@
   return NULL;
 }
 
 gfx::Rect BrowserAccessibility::GetLocalBoundsRect() {
   gfx::Rect bounds = location_;
 
   // Adjust top left position by the root document's scroll offset.
   BrowserAccessibility* root = manager_->GetRoot();
   int scroll_x = 0;
   int scroll_y = 0;
-  if (!root->GetIntAttribute(WebAccessibility::ATTR_SCROLL_X, &scroll_x) ||
-      !root->GetIntAttribute(WebAccessibility::ATTR_SCROLL_Y, &scroll_y)) {
+  if (!root->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X, &scroll_x) ||
+      !root->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_Y, &scroll_y)) {
     return bounds;
   }
   bounds.Offset(-scroll_x, -scroll_y);
 
   return bounds;
 }
 
 gfx::Rect BrowserAccessibility::GetGlobalBoundsRect() {
   gfx::Rect bounds = GetLocalBoundsRect();
 
@@ skipping 134 matching lines @@
 
   if (EqualsASCII(value, "true"))
     return true;
 
   if (EqualsASCII(value, "mixed"))
     *is_mixed = true;
 
   return false;  // Not set
 }
 
-bool BrowserAccessibility::HasState(WebAccessibility::State state_enum) const {
+bool BrowserAccessibility::HasState(
+    AccessibilityNodeData::State state_enum) const {
   return (state_ >> state_enum) & 1;
 }
 
 bool BrowserAccessibility::IsEditableText() const {
   // Note: STATE_READONLY being false means it's either a text control,
   // or contenteditable. We also check for editable text roles to cover
   // another element that has role=textbox set on it.
-  return (!HasState(WebAccessibility::STATE_READONLY) ||
-          role_ == WebAccessibility::ROLE_TEXT_FIELD ||
-          role_ == WebAccessibility::ROLE_TEXTAREA);
+  return (!HasState(AccessibilityNodeData::STATE_READONLY) ||
+          role_ == AccessibilityNodeData::ROLE_TEXT_FIELD ||
+          role_ == AccessibilityNodeData::ROLE_TEXTAREA);
 }
 
 string16 BrowserAccessibility::GetTextRecursive() const {
   if (!name_.empty()) {
     return name_;
   }
 
   string16 result;
   for (size_t i = 0; i < children_.size(); ++i)
     result += children_[i]->GetTextRecursive();
   return result;
 }
 
 void BrowserAccessibility::PreInitialize() {
   instance_active_ = true;
 }