Revert of Send Windows accessibility events based on tree updates.

content/browser/accessibility/browser_accessibility_manager_win.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_win.h"
 
 #include "base/command_line.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
@@ skipping 55 matching lines @@
     return NULL;
   return delegate_->AccessibilityGetAcceleratedWidget();
 }
 
 IAccessible* BrowserAccessibilityManagerWin::GetParentIAccessible() {
   if (!delegate_)
     return NULL;
   return delegate_->AccessibilityGetNativeViewAccessible();
 }
 
-void BrowserAccessibilityManagerWin::MaybeCallNotifyWinEvent(
-    DWORD event, BrowserAccessibility* node) {
+void BrowserAccessibilityManagerWin::MaybeCallNotifyWinEvent(DWORD event,
+                                                             LONG child_id) {
   BrowserAccessibilityDelegate* delegate = GetDelegateFromRootManager();
   if (!delegate)
     return;
 
-  if (!node->IsNative())
-    return;
-
   HWND hwnd = delegate->AccessibilityGetAcceleratedWidget();
   if (!hwnd)
     return;
 
-  // Inline text boxes are an internal implementation detail, we don't
-  // expose them to Windows.
-  if (node->GetRole() == ui::AX_ROLE_INLINE_TEXT_BOX)
-    return;
-
-  // It doesn't make sense to fire a REORDER event on a leaf node; that
-  // happens when the node has internal children line inline text boxes.
-  if (event == EVENT_OBJECT_REORDER && node->PlatformIsLeaf())
-    return;
-
-  // Don't fire focus, or load complete notifications if the
-  // window isn't focused, because that can confuse screen readers into
-  // entering their "browse" mode.
-  if ((event == EVENT_OBJECT_FOCUS ||
-       event == IA2_EVENT_DOCUMENT_LOAD_COMPLETE) &&
-      (!delegate_->AccessibilityViewHasFocus())) {
-    return;
-  }
-
-  // NVDA gets confused if we focus the main document element when it hasn't
-  // finished loading and it has no children at all, so suppress that event.
-  if (event == EVENT_OBJECT_FOCUS &&
-      node == GetRoot() &&
-      node->PlatformChildCount() == 0 &&
-      !node->HasState(ui::AX_STATE_BUSY) &&
-      !node->GetBoolAttribute(ui::AX_ATTR_DOC_LOADED)) {
-    return;
-  }
-
-  // If a focus event is needed on the root, fire that first before
-  // this event.
-  if (event == EVENT_OBJECT_FOCUS && node == GetRoot())
-    focus_event_on_root_needed_ = false;
-  else if (focus_event_on_root_needed_)
-    OnWindowFocused();
-
-  LONG child_id = node->ToBrowserAccessibilityWin()->unique_id_win();
   ::NotifyWinEvent(event, hwnd, OBJID_CLIENT, child_id);
 }
 
 void BrowserAccessibilityManagerWin::OnNodeCreated(ui::AXNode* node) {
   BrowserAccessibilityManager::OnNodeCreated(node);
   BrowserAccessibility* obj = GetFromAXNode(node);
-  if (!obj)
-    return;
-  if (!obj->IsNative())
-    return;
   LONG unique_id_win = obj->ToBrowserAccessibilityWin()->unique_id_win();
   unique_id_to_ax_id_map_[unique_id_win] = obj->GetId();
 }
 
 void BrowserAccessibilityManagerWin::OnNodeWillBeDeleted(ui::AXNode* node) {
   BrowserAccessibilityManager::OnNodeWillBeDeleted(node);
   BrowserAccessibility* obj = GetFromAXNode(node);
   if (!obj)
     return;
-  if (!obj->IsNative())
-    return;
   unique_id_to_ax_id_map_.erase(
       obj->ToBrowserAccessibilityWin()->unique_id_win());
   if (obj == tracked_scroll_object_) {
     tracked_scroll_object_->Release();
     tracked_scroll_object_ = NULL;
   }
 }
 
 void BrowserAccessibilityManagerWin::OnWindowFocused() {
   // This is called either when this web frame gets focused, or when
@@ skipping 55 matching lines @@
     OnWindowFocused();
 
   LONG event_id = EVENT_MIN;
   switch (event_type) {
     case ui::AX_EVENT_ACTIVEDESCENDANTCHANGED:
       event_id = IA2_EVENT_ACTIVE_DESCENDANT_CHANGED;
       break;
     case ui::AX_EVENT_ALERT:
       event_id = EVENT_SYSTEM_ALERT;
       break;
+    case ui::AX_EVENT_ARIA_ATTRIBUTE_CHANGED:
+      event_id = IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED;
+      break;
     case ui::AX_EVENT_AUTOCORRECTION_OCCURED:
       event_id = IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED;
       break;
     case ui::AX_EVENT_BLUR:
       // Equivalent to focus on the root.
       event_id = EVENT_OBJECT_FOCUS;
       node = GetRoot();
       break;
+    case ui::AX_EVENT_CHECKED_STATE_CHANGED:
+      event_id = EVENT_OBJECT_STATECHANGE;
+      break;
     case ui::AX_EVENT_CHILDREN_CHANGED:
       event_id = EVENT_OBJECT_REORDER;
       break;
     case ui::AX_EVENT_FOCUS:
       event_id = EVENT_OBJECT_FOCUS;
       break;
+    case ui::AX_EVENT_INVALID_STATUS_CHANGED:
+      event_id = EVENT_OBJECT_STATECHANGE;
+      break;
     case ui::AX_EVENT_LIVE_REGION_CHANGED:
       if (node->GetBoolAttribute(ui::AX_ATTR_CONTAINER_LIVE_BUSY))
         return;
       event_id = EVENT_OBJECT_LIVEREGIONCHANGED;
       break;
     case ui::AX_EVENT_LOAD_COMPLETE:
       event_id = IA2_EVENT_DOCUMENT_LOAD_COMPLETE;
       break;
     case ui::AX_EVENT_MENU_LIST_ITEM_SELECTED:
       event_id = EVENT_OBJECT_FOCUS;
       break;
     case ui::AX_EVENT_MENU_LIST_VALUE_CHANGED:
       event_id = EVENT_OBJECT_VALUECHANGE;
       break;
+    case ui::AX_EVENT_HIDE:
+      event_id = EVENT_OBJECT_HIDE;
+      break;
+    case ui::AX_EVENT_SHOW:
+      event_id = EVENT_OBJECT_SHOW;
+      break;
     case ui::AX_EVENT_SCROLL_POSITION_CHANGED:
       event_id = EVENT_SYSTEM_SCROLLINGEND;
       break;
     case ui::AX_EVENT_SCROLLED_TO_ANCHOR:
       event_id = EVENT_SYSTEM_SCROLLINGSTART;
       break;
     case ui::AX_EVENT_SELECTED_CHILDREN_CHANGED:
       event_id = EVENT_OBJECT_SELECTIONWITHIN;
       break;
+    case ui::AX_EVENT_TEXT_CHANGED:
+      event_id = EVENT_OBJECT_NAMECHANGE;
+      break;
     case ui::AX_EVENT_TEXT_SELECTION_CHANGED:
       event_id = IA2_EVENT_TEXT_CARET_MOVED;
       break;
+    case ui::AX_EVENT_VALUE_CHANGED:
+      event_id = EVENT_OBJECT_VALUECHANGE;
+      break;
     default:
       // Not all WebKit accessibility events result in a Windows
       // accessibility notification.
       break;
   }
 
   if (event_id != EVENT_MIN) {
     // Pass the node's unique id in the |child_id| argument to NotifyWinEvent;
     // the AT client will then call get_accChild on the HWND's accessibility
     // object and pass it that same id, which we can use to retrieve the
     // IAccessible for this node.
-    MaybeCallNotifyWinEvent(event_id, node);
+    LONG child_id = node->ToBrowserAccessibilityWin()->unique_id_win();
+    MaybeCallNotifyWinEvent(event_id, child_id);
   }
 
   // If this is a layout complete notification (sent when a container scrolls)
   // and there is a descendant tracked object, send a notification on it.
   // TODO(dmazzoni): remove once http://crbug.com/113483 is fixed.
   if (event_type == ui::AX_EVENT_LAYOUT_COMPLETE &&
       tracked_scroll_object_ &&
       tracked_scroll_object_->IsDescendantOf(node)) {
     MaybeCallNotifyWinEvent(
-        IA2_EVENT_VISIBLE_DATA_CHANGED, tracked_scroll_object_);
+        IA2_EVENT_VISIBLE_DATA_CHANGED,
+        tracked_scroll_object_->ToBrowserAccessibilityWin()->unique_id_win());
     tracked_scroll_object_->Release();
     tracked_scroll_object_ = NULL;
   }
 }
 
 void BrowserAccessibilityManagerWin::OnAtomicUpdateFinished(
     bool root_changed,
     const std::vector<ui::AXTreeDelegate::Change>& changes) {
   BrowserAccessibilityManager::OnAtomicUpdateFinished(root_changed, changes);
 
   if (root_changed) {
     // In order to make screen readers aware of the new accessibility root,
     // we need to fire a focus event on it.
     OnWindowFocused();
   }
-
-  // BrowserAccessibilityManager::OnAtomicUpdateFinished calls
-  // OnUpdateFinished() on each node in |changes|. However, the
-  // IAccessibleText text for a node is a concatenatenation of all of its child
-  // text nodes, so we can't compute a node's IAccessibleText in
-  // OnUpdateFinished because its children may not have been updated yet.
-  //
-  // So we make a second pass here to update IAccessibleText.
-  for (size_t i = 0; i < changes.size(); ++i) {
-    BrowserAccessibility* obj = GetFromAXNode(changes[i].node);
-    if (obj && obj->IsNative())
-      obj->ToBrowserAccessibilityWin()->UpdateIAccessibleText();
-  }
 }
 
 void BrowserAccessibilityManagerWin::TrackScrollingObject(
     BrowserAccessibilityWin* node) {
   if (tracked_scroll_object_)
     tracked_scroll_object_->Release();
   tracked_scroll_object_ = node;
   tracked_scroll_object_->AddRef();
 }
 
 BrowserAccessibilityWin* BrowserAccessibilityManagerWin::GetFromUniqueIdWin(
     LONG unique_id_win) {
   base::hash_map<LONG, int32>::iterator iter =
       unique_id_to_ax_id_map_.find(unique_id_win);
   if (iter != unique_id_to_ax_id_map_.end()) {
     BrowserAccessibility* result = GetFromID(iter->second);
-    if (result && result->IsNative())
+    if (result)
       return result->ToBrowserAccessibilityWin();
   }
 
   // Also search all child frames, such as out-of-process iframes or
   // guest browser plugins.
   if (delegate()) {
     std::vector<BrowserAccessibilityManager*> child_frames;
     delegate()->AccessibilityGetAllChildFrames(&child_frames);
     for (size_t i = 0; i < child_frames.size(); ++i) {
       BrowserAccessibilityManagerWin* child_manager =
           child_frames[i]->ToBrowserAccessibilityManagerWin();
       BrowserAccessibilityWin* result =
           child_manager->GetFromUniqueIdWin(unique_id_win);
       if (result)
         return result;
     }
   }
 
   return NULL;
 }
 
 }  // namespace content