Make sure the document's scroll position is always up-to-date before...

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 63 matching lines @@
       NOTREACHED();
       return false;
   }
   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) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableAccessibility))
     WebAccessibilityObject::enableAccessibility();
   if (command_line.HasSwitch(switches::kEnableAccessibilityLogging))
     logging_ = true;
 }
 
@@ skipping 63 matching lines @@
 
   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))
@@ skipping 248 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();
 }