Reset accessibility if it gets out of sync.

content/renderer/accessibility/renderer_accessibility_complete.cc

Index: content/renderer/accessibility/renderer_accessibility_complete.cc
diff --git a/content/renderer/accessibility/renderer_accessibility_complete.cc b/content/renderer/accessibility/renderer_accessibility_complete.cc
index 6c4cc9245c7630b2bf1fbdd413549fee9cc41e28..ef0cd11d562c34ca84e86b5965b66466f68ffd9f 100644
--- a/content/renderer/accessibility/renderer_accessibility_complete.cc
+++ b/content/renderer/accessibility/renderer_accessibility_complete.cc
@@ -39,6 +39,7 @@ RendererAccessibilityComplete::RendererAccessibilityComplete(
       serializer_(&tree_source_),
       last_scroll_offset_(gfx::Size()),
       ack_pending_(false),
+      reset_token_(0),
       weak_factory_(this) {
   WebView* web_view = render_frame_->GetRenderView()->GetWebView();
   WebSettings* settings = web_view->settings();
@@ -80,6 +81,7 @@ bool RendererAccessibilityComplete::OnMessageReceived(
     IPC_MESSAGE_HANDLER(AccessibilityMsg_SetTextSelection,
                         OnSetTextSelection)
     IPC_MESSAGE_HANDLER(AccessibilityMsg_HitTest, OnHitTest)
+    IPC_MESSAGE_HANDLER(AccessibilityMsg_Reset, OnReset)
     IPC_MESSAGE_HANDLER(AccessibilityMsg_FatalError, OnFatalError)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -227,7 +229,8 @@ void RendererAccessibilityComplete::SendPendingAccessibilityEvents() {
             << "\n" << event_msg.update.ToString();
   }
 
-  Send(new AccessibilityHostMsg_Events(routing_id(), event_msgs));
+  Send(new AccessibilityHostMsg_Events(routing_id(), event_msgs, reset_token_));
+  reset_token_ = 0;

[nasko, 2014/10/03 15:58:41]

nit: I'd move this assignment in the OnReset, so when one reads the method it is
clear that reset_token_ is non-zero only for the duration of that method.

[dmazzoni, 2014/10/03 19:08:12]

Unfortunately that won't work - HandleAXEvent doesn't run synchronously, it
posts a task.

[nasko, 2014/10/06 16:39:02]

Acknowledged.

 
   if (had_layout_complete_messages)
     SendLocationChanges();
@@ -414,6 +417,16 @@ void RendererAccessibilityComplete::OnSetFocus(int acc_obj_id) {
     obj.setFocused(true);
 }
 
+void RendererAccessibilityComplete::OnReset(int reset_token) {
+  reset_token_ = reset_token;
+  serializer_.Reset();
+  pending_events_.clear();
+
+  const WebDocument& document = GetMainDocument();
+  if (!document.isNull())
+    HandleAXEvent(document.accessibilityObject(), ui::AX_EVENT_LAYOUT_COMPLETE);
+}
+
 void RendererAccessibilityComplete::OnFatalError() {
   CHECK(false) << "Invalid accessibility tree.";
 }