Remove special casing for firing load completes.

content/renderer/renderer_accessibility.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 "base/command_line.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_accessibility.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
@@ skipping 68 matching lines @@
   }
   return true;
 }
 
 RendererAccessibility::RendererAccessibility(RenderViewImpl* render_view)
     : content::RenderViewObserver(render_view),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       browser_root_(NULL),
       last_scroll_offset_(gfx::Size()),
       ack_pending_(false),
-      logging_(false),
-      sent_load_complete_(false) {
+      logging_(false) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableAccessibility))
     WebAccessibilityObject::enableAccessibility();
   if (command_line.HasSwitch(switches::kEnableAccessibilityLogging))
     logging_ = true;
 }
 
 RendererAccessibility::~RendererAccessibility() {
 }
 
@@ skipping 41 matching lines @@
     return;
 
   // Check to see if the root accessibility object has changed, to work
   // around WebKit bugs that cause AXObjectCache to be cleared
   // unnecessarily.
   // TODO(dmazzoni): remove this once rdar://5794454 is fixed.
   WebAccessibilityObject new_root = document.accessibilityObject();
   if (!browser_root_ || new_root.axID() != browser_root_->id) {
     PostAccessibilityNotification(
         new_root,
-        WebKit::WebAccessibilityNotificationLoadComplete);
+        WebKit::WebAccessibilityNotificationLayoutComplete);
   }
 }
 
 void RendererAccessibility::PostAccessibilityNotification(
     const WebAccessibilityObject& obj,
     WebAccessibilityNotification notification) {
   if (!WebAccessibilityObject::accessibilityEnabled())
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
-  if (notification != WebKit::WebAccessibilityNotificationLoadComplete &&
-      !sent_load_complete_) {
-    // Load complete should be our first notification sent. Send it manually
-    // in cases where we don't get it first to avoid focus problems.
-    PostAccessibilityNotification(
-        document.accessibilityObject(),
-        WebKit::WebAccessibilityNotificationLoadComplete);
-  }
-
   gfx::Size scroll_offset = document.frame()->scrollOffset();
   if (scroll_offset != last_scroll_offset_) {
     // Make sure the browser is always aware of the scroll position of
     // the root document element by posting a generic notification that
     // will update it.
     // TODO(dmazzoni): remove this as soon as
     // https://bugs.webkit.org/show_bug.cgi?id=73460 is fixed.
     last_scroll_offset_ = scroll_offset;
     PostAccessibilityNotification(
         document.accessibilityObject(),
         WebKit::WebAccessibilityNotificationLayoutComplete);
   }
 
-  if (notification == WebKit::WebAccessibilityNotificationLoadComplete)
-    sent_load_complete_ = true;
-
   // Add the accessibility object to our cache and ensure it's valid.
   Notification acc_notification;
   acc_notification.id = obj.axID();
   acc_notification.type = notification;
 
   ViewHostMsg_AccEvent::Value temp;
   if (!WebAccessibilityNotificationToViewHostMsg(notification, &temp))
     return;
 
   // Discard duplicate accessibility notifications.
@@ skipping 22 matching lines @@
     return;
 
   if (pending_notifications_.empty())
     return;
 
   // Send all pending accessibility notifications.
   std::vector<ViewHostMsg_AccessibilityNotification_Params> notifications;
   for (size_t i = 0; i < pending_notifications_.size(); ++i) {
     Notification& notification = pending_notifications_[i];
 
-    bool includes_children = ShouldIncludeChildren(notification);
+    // TODO(dtseng): Come up with a cleaner way of deciding to include children.
+    int root_id = document.accessibilityObject().axID();
+    bool includes_children = ShouldIncludeChildren(notification) ||
+        root_id == notification.id;
     WebAccessibilityObject obj = document.accessibilityObjectFromID(
         notification.id);
 
     // The browser may not have this object yet, for example if we get a
     // notification on an object that was recently added, or if we get a
     // notification on a node before the page has loaded. Work our way
     // up the parent chain until we find a node the browser has, or until
     // we reach the root.
-    int root_id = document.accessibilityObject().axID();
     while (browser_id_map_.find(obj.axID()) == browser_id_map_.end() &&
            obj.isValid() &&
            obj.axID() != root_id) {
       obj = obj.parentObject();
       includes_children = true;
       if (notification.type ==
           WebKit::WebAccessibilityNotificationChildrenChanged) {
         notification.id = obj.axID();
       }
     }
@@ skipping 208 matching lines @@
 
   WebAccessibilityObject::enableAccessibility();
 
   const WebDocument& document = GetMainDocument();
   if (!document.isNull()) {
     // It's possible that the webview has already loaded a webpage without
     // accessibility being enabled. Initialize the browser's cached
     // accessibility tree by sending it a 'load complete' notification.
     PostAccessibilityNotification(
         document.accessibilityObject(),
-        WebKit::WebAccessibilityNotificationLoadComplete);
+        WebKit::WebAccessibilityNotificationLayoutComplete);
   }
 }
 
 void RendererAccessibility::OnSetAccessibilityFocus(int acc_obj_id) {
   if (!WebAccessibilityObject::accessibilityEnabled())
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
@@ skipping 41 matching lines @@
 
 WebDocument RendererAccessibility::GetMainDocument() {
   WebView* view = render_view()->GetWebView();
   WebFrame* main_frame = view ? view->mainFrame() : NULL;
 
   if (main_frame)
     return main_frame->document();
   else
     return WebDocument();
 }