Update browser accessibility tree on a renderer accessibility object state ch...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 159 matching lines @@
 using appcache::WebApplicationCacheHostImpl;
 using base::Time;
 using base::TimeDelta;
 using webkit_glue::AltErrorPageResourceFetcher;
 using webkit_glue::FormData;
 using webkit_glue::FormField;
 using webkit_glue::ImageResourceFetcher;
 using webkit_glue::PasswordForm;
 using webkit_glue::PasswordFormDomManager;
 using webkit_glue::SiteIsolationMetrics;
+using webkit_glue::WebAccessibility;
 using WebKit::WebAccessibilityCache;
 using WebKit::WebAccessibilityObject;
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
 using WebKit::WebColor;
 using WebKit::WebColorName;
 using WebKit::WebConsoleMessage;
 using WebKit::WebContextMenuData;
 using WebKit::WebCookieJar;
 using WebKit::WebCString;
@@ skipping 4120 matching lines @@
 }
 
 void RenderView::OnGetAccessibilityTree() {
   if (accessibility_.get())
     accessibility_->clear();
     accessibility_.reset(WebAccessibilityCache::create());
     accessibility_->initialize(webview());
   accessibility_changes_.clear();
 
   WebAccessibilityObject src_tree = webview()->accessibilityObject();
-  webkit_glue::WebAccessibility dst_tree(src_tree, accessibility_.get());
+  WebAccessibility dst_tree(src_tree, accessibility_.get());
   Send(new ViewHostMsg_AccessibilityTree(routing_id_, dst_tree));
 }
 
 void RenderView::OnSetAccessibilityFocus(int acc_obj_id) {
   if (!accessibility_.get())
     return;
   if (accessibility_->isValidId(acc_obj_id)) {
     // TODO(dmazzoni) fix the cache so that id=1000 is not a magic number.
     // By convention, calling SetFocus on the root of the tree (id = 1000)
     // should clear the current focus. Otherwise set the focus to the new
@@ skipping 1006 matching lines @@
   if (acc_obj_id >= 0)
     Send(new ViewHostMsg_AccessibilityFocusChange(routing_id_, acc_obj_id));
 
 #else  // defined(OS_WIN)
   // TODO(port): accessibility not yet implemented
   NOTIMPLEMENTED();
 #endif
 }
 
 void RenderView::didChangeAccessibilityObjectState(
-    const WebKit::WebAccessibilityObject& acc_obj) {
-#if defined(OS_WIN)
-  // TODO(dglazkov): Current logic implies that a state change can only be made
-  // after at least one call to RenderView::OnGetAccessibilityInfo, which is
-  // where accessibility is initialized. We should determine whether that's
-  // right.
+    const WebAccessibilityObject& acc_obj) {
   if (!accessibility_.get())
     return;
 
-  // Retrieve the accessibility object id of the AccessibilityObject.
-  int acc_obj_id = accessibility_->addOrGetId(acc_obj);
-
-  // If id is valid, alert the browser side that an accessibility object state
-  // change occurred.
-  if (acc_obj_id >= 0)
-    Send(new ViewHostMsg_AccessibilityObjectStateChange(routing_id_,
-                                                        acc_obj_id));
-
-#else  // defined(OS_WIN)
-  // TODO(port): accessibility not yet implemented
-  NOTIMPLEMENTED();
-#endif
+  Send(new ViewHostMsg_AccessibilityObjectStateChange(
+      routing_id_, WebAccessibility(acc_obj, accessibility_.get())));
 }
 
 void RenderView::didChangeAccessibilityObjectChildren(
-    const WebKit::WebAccessibilityObject& acc_obj) {
+    const WebAccessibilityObject& acc_obj) {
   if (!accessibility_.get())
     return;
 
   if (accessibility_changes_.empty()) {
     Send(new ViewHostMsg_AccessibilityObjectChildrenChange(
-        routing_id_,
-        std::vector<webkit_glue::WebAccessibility>()));
+        routing_id_, std::vector<WebAccessibility>()));
   }
 
   accessibility_changes_.push_back(
-      webkit_glue::WebAccessibility(acc_obj, accessibility_.get()));
+      WebAccessibility(acc_obj, accessibility_.get()));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }
 
@@ skipping 279 matching lines @@
   PendingOpenFileSystem* request = pending_file_system_requests_.Lookup(
       request_id);
   DCHECK(request);
   if (accepted)
     request->callbacks->didOpenFileSystem(name, root_path);
   else
     request->callbacks->didFail(WebKit::WebFileErrorSecurity);
   request->callbacks = NULL;
   pending_file_system_requests_.Remove(request_id);
 }