Windows accessibility improvements: 1. All WebKit roles are now passed to the...

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 667 matching lines @@
 #endif
     IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent,
                         OnSetEditCommandsForNextKeyEvent)
     IPC_MESSAGE_HANDLER(ViewMsg_ExecuteCode,
                         OnExecuteCode)
     IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction,
                         OnCustomContextMenuAction)
     IPC_MESSAGE_HANDLER(ViewMsg_TranslatePage, OnTranslatePage)
     IPC_MESSAGE_HANDLER(ViewMsg_RevertTranslation, OnRevertTranslation)
     IPC_MESSAGE_HANDLER(ViewMsg_GetAccessibilityTree, OnGetAccessibilityTree)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetAccessibilityFocus, OnSetAccessibilityFocus)
+    IPC_MESSAGE_HANDLER(ViewMsg_AccessibilityDoDefaultAction,
+                        OnAccessibilityDoDefaultAction)
 
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(RenderWidget::OnMessageReceived(message))
   IPC_END_MESSAGE_MAP()
 }
 
 void RenderView::SendThumbnail() {
   WebFrame* main_frame = webview()->mainFrame();
   if (!main_frame)
     return;
@@ skipping 3224 matching lines @@
     }
   }
   view_type_ = type;
 }
 
 void RenderView::OnUpdateBrowserWindowId(int window_id) {
   browser_window_id_ = window_id;
 }
 
 void RenderView::OnGetAccessibilityTree() {
-  if (accessibility_.get()) {
+  if (accessibility_.get())
     accessibility_->clear();
-  }
     accessibility_.reset(WebAccessibilityCache::create());
     accessibility_->initialize(webview());
 
   WebAccessibilityObject src_tree = webview()->accessibilityObject();
   webkit_glue::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
+    // node.
+    if (acc_obj_id == 1000)
+      webview()->clearFocusedNode();
+    else
+      accessibility_->getObjectById(acc_obj_id).setFocused(true);
+  }
+}
+
+void RenderView::OnAccessibilityDoDefaultAction(int acc_obj_id) {
+  if (!accessibility_.get())
+    return;
+  if (accessibility_->isValidId(acc_obj_id)) {
+    accessibility_->getObjectById(acc_obj_id).performDefaultAction();
+  }
+}
+
 void RenderView::OnGetAllSavableResourceLinksForCurrentPage(
     const GURL& page_url) {
   // Prepare list to storage all savable resource links.
   std::vector<GURL> resources_list;
   std::vector<GURL> referrers_list;
   std::vector<GURL> frames_list;
   webkit_glue::SavableResourcesResult result(&resources_list,
                                              &referrers_list,
                                              &frames_list);
 
@@ skipping 1042 matching lines @@
 
     if (last_top_level_navigation_page_id_ != page_id_ &&
         // Not interested in reloads.
         type != WebKit::WebNavigationTypeReload &&
         type != WebKit::WebNavigationTypeFormSubmitted) {
       return true;
     }
   }
   return false;
 }