Revert 113704 - Remove special casing for firing load completes.

content/browser/accessibility/browser_accessibility_manager.cc

 // Copyright (c) 2011 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/view_messages.h"
 
@@ skipping 214 matching lines @@
 gfx::Rect BrowserAccessibilityManager::GetViewBounds() {
   if (delegate_)
     return delegate_->GetViewBounds();
   return gfx::Rect();
 }
 
 void BrowserAccessibilityManager::UpdateNode(
     const WebAccessibility& 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) {
-    // As an exceptional case, there can only be one root of the tree, so
-    // if we get a new root, replace the current root no matter what the
-    // current root's renderer ID is.
     current = root_;
-    renderer_id_to_child_id_map_.erase(current->renderer_id());
-    renderer_id_to_child_id_map_[src.id] = current->child_id();
   } else {
-    // Otherwise, replace the node based on its renderer ID.
     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);
     }
   }
 
+  // If we can't find the node to replace, we're out of sync with the
+  // renderer (this would be a bug).
+  DCHECK(current);
   if (!current)
     return;
 
+  // If this update is just for a single node (|include_children| is false),
+  // modify |current| directly and return - no tree changes are needed.
   if (!include_children) {
     DCHECK_EQ(0U, src.children.size());
     current->Initialize(
         this,
         current->parent(),
         current->child_id(),
         current->index_in_parent(),
         src);
     current->SendNodeUpdateEvents();
     return;
@@ skipping 10 matching lines @@
   // Build a new tree, reusing old nodes if possible. Each node that's
   // reused will have its reference count incremented by one.
   current = CreateAccessibilityTree(
       current_parent, src, current_index_in_parent, true);
 
   // Decrement the reference count of all nodes in the old tree, which will
   // delete any nodes no longer needed.
   for (int i = 0; i < static_cast<int>(old_tree_nodes.size()); i++)
     old_tree_nodes[i]->InternalReleaseReference(false);
 
-  if (!focus_ || !focus_->instance_active())
-    SetFocus(root_, false);
+  // If the only reference to the focused node is focus_ itself, then the
+  // focused node is no longer in the tree, so set the focus to the root.
+  if (focus_ && focus_->ref_count() == 1) {
+    SetFocus(root_, true);
+    if (!delegate_ || delegate_->HasFocus())
+      NotifyAccessibilityEvent(ViewHostMsg_AccEvent::FOCUS_CHANGED, focus_);
+  }
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::CreateAccessibilityTree(
     BrowserAccessibility* parent,
     const WebAccessibility& 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;
@@ skipping 29 matching lines @@
   } else {
     // Otherwise, create a new instance.
     instance = factory_->Create();
     child_id = GetNextChildID();
     children_can_send_show_events = false;
   }
 
   instance->Initialize(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.role == WebAccessibility::ROLE_ROOT_WEB_AREA)
+    root_ = instance;
+
   if ((src.state >> WebAccessibility::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);
   }
 
   // Note: the purpose of send_show_events and children_can_send_show_events
   // is so that we send a single OBJECT_SHOW 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(ViewHostMsg_AccEvent::OBJECT_SHOW, instance);
 
   instance->SendNodeUpdateEvents();
 
   return instance;
 }