Revert of Send Windows accessibility events based on tree updates.

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/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 20 matching lines @@
 
 BrowserAccessibility::~BrowserAccessibility() {
 }
 
 void BrowserAccessibility::Init(BrowserAccessibilityManager* manager,
     ui::AXNode* node) {
   manager_ = manager;
   node_ = node;
 }
 
+void BrowserAccessibility::OnDataChanged() {
+  GetStringAttribute(ui::AX_ATTR_NAME, &name_);
+  GetStringAttribute(ui::AX_ATTR_VALUE, &value_);
+}
+
 bool BrowserAccessibility::PlatformIsLeaf() const {
   if (InternalChildCount() == 0)
     return true;
 
   // All of these roles may have children that we use as internal
   // implementation details, but we want to expose them as leaves
   // to platform accessibility APIs.
   switch (GetRole()) {
     case ui::AX_ROLE_LINE_BREAK:
     case ui::AX_ROLE_SLIDER:
@@ skipping 33 matching lines @@
   if (result->HasBoolAttribute(ui::AX_ATTR_IS_AX_TREE_HOST)) {
     BrowserAccessibilityManager* child_manager =
         manager_->delegate()->AccessibilityGetChildFrame(result->GetId());
     if (child_manager)
       result = child_manager->GetRoot();
   }
 
   return result;
 }
 
-bool BrowserAccessibility::PlatformIsChildOfLeaf() const {
-  BrowserAccessibility* ancestor = GetParent();
-  while (ancestor) {
-    if (ancestor->PlatformIsLeaf())
-      return true;
-    ancestor = ancestor->GetParent();
-  }
-
-  return false;
-}
-
 BrowserAccessibility* BrowserAccessibility::GetPreviousSibling() {
   if (GetParent() && GetIndexInParent() > 0)
     return GetParent()->InternalGetChild(GetIndexInParent() - 1);
 
   return NULL;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetNextSibling() {
   if (GetParent() &&
       GetIndexInParent() >= 0 &&
@@ skipping 268 matching lines @@
   if (descendant_result)
     return descendant_result;
   if (child_result)
     return child_result;
 
   return this;
 }
 
 void BrowserAccessibility::Destroy() {
   // Allow the object to fire a TextRemoved notification.
+  name_.clear();
+  value_.clear();
+
   manager_->NotifyAccessibilityEvent(ui::AX_EVENT_HIDE, this);
   node_ = NULL;
   manager_ = NULL;
 
   NativeReleaseReference();
 }
 
 void BrowserAccessibility::NativeReleaseReference() {
   delete this;
 }
@@ skipping 150 matching lines @@
 bool BrowserAccessibility::GetString16Attribute(
     ui::AXStringAttribute attribute,
     base::string16* value) const {
   std::string value_utf8;
   if (!GetStringAttribute(attribute, &value_utf8))
     return false;
   *value = base::UTF8ToUTF16(value_utf8);
   return true;
 }
 
+void BrowserAccessibility::SetStringAttribute(
+    ui::AXStringAttribute attribute, const std::string& value) {
+  if (!node_)
+    return;
+  ui::AXNodeData data = GetData();
+  for (size_t i = 0; i < data.string_attributes.size(); ++i) {
+    if (data.string_attributes[i].first == attribute) {
+      data.string_attributes[i].second = value;
+      node_->SetData(data);
+      return;
+    }
+  }
+  if (!value.empty()) {
+    data.string_attributes.push_back(std::make_pair(attribute, value));
+    node_->SetData(data);
+  }
+}
+
 bool BrowserAccessibility::HasIntListAttribute(
     ui::AXIntListAttribute attribute) const {
   const ui::AXNodeData& data = GetData();
   for (size_t i = 0; i < data.intlist_attributes.size(); ++i) {
     if (data.intlist_attributes[i].first == attribute)
       return true;
   }
 
   return false;
 }
@@ skipping 107 matching lines @@
   if (!parent)
     return false;
 
   BrowserAccessibility* grandparent = parent->GetParent();
   if (!grandparent)
     return false;
 
   return grandparent->GetRole() == ui::AX_ROLE_IFRAME_PRESENTATIONAL;
 }
 
+std::string BrowserAccessibility::GetTextRecursive() const {
+  if (!name_.empty()) {
+    return name_;
+  }
+
+  std::string result;
+  for (uint32 i = 0; i < PlatformChildCount(); ++i)
+    result += PlatformGetChild(i)->GetTextRecursive();
+  return result;
+}
+
 int BrowserAccessibility::GetStaticTextLenRecursive() const {
   if (GetRole() == ui::AX_ROLE_STATIC_TEXT)
     return static_cast<int>(GetStringAttribute(ui::AX_ATTR_VALUE).size());
 
   int len = 0;
   for (size_t i = 0; i < InternalChildCount(); ++i)
     len += InternalGetChild(i)->GetStaticTextLenRecursive();
   return len;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetParentForBoundsCalculation()
     const {
   if (!node_ || !manager_)
     return NULL;
   ui::AXNode* parent = node_->parent();
   if (parent)
     return manager_->GetFromAXNode(parent);
 
   if (!manager_->delegate())
     return NULL;
 
   return manager_->delegate()->AccessibilityGetParentFrame();
 }
 
 }  // namespace content