Relanding http://codereview.chromium.org/8416034

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 222 matching lines @@
   // 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(
+    current->PreInitialize(
         this,
         current->parent(),
         current->child_id(),
         current->index_in_parent(),
         src);
-    current->SendNodeUpdateEvents();
+    current->PostInitialize();
     return;
   }
 
   BrowserAccessibility* current_parent = current->parent();
   int current_index_in_parent = current->index_in_parent();
 
   // Detach all of the nodes in the old tree and get a single flat vector
   // of all node pointers.
   std::vector<BrowserAccessibility*> old_tree_nodes;
   current->DetachTree(&old_tree_nodes);
@@ skipping 54 matching lines @@
     instance->UpdateParent(parent, index_in_parent);
     instance->InternalAddReference();
     send_show_events = false;
   } 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);
+  instance->PreInitialize(this, parent, child_id, index_in_parent, src);
+  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);
+  }
+
   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();
+  instance->PostInitialize();
 
   return instance;
 }