Introduce WebAccessibilityControllerImpl....

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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.
 
 #if defined(ENABLE_PEPPER)
 #define PEPPER_APIS_ENABLED
 #endif
 
 #include "chrome/renderer/render_view.h"
 
@@ skipping 46 matching lines @@
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "chrome/renderer/webworker_proxy.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/data_url.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/image_operations.h"
+#include "webkit/api/public/WebAccessibilityCache.h"
 #include "webkit/api/public/WebAccessibilityObject.h"
 #include "webkit/api/public/WebDataSource.h"
 #include "webkit/api/public/WebDevToolsAgent.h"
 #include "webkit/api/public/WebDragData.h"
 #include "webkit/api/public/WebForm.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebHistoryItem.h"
 #include "webkit/api/public/WebNode.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebRect.h"
@@ skipping 30 matching lines @@
 #include "app/gfx/native_theme_win.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using webkit_glue::AltErrorPageResourceFetcher;
 using webkit_glue::FormFieldValues;
 using webkit_glue::ImageResourceFetcher;
 using webkit_glue::PasswordForm;
 using webkit_glue::PasswordFormDomManager;
+using WebKit::WebAccessibilityCache;
 using WebKit::WebAccessibilityObject;
 using WebKit::WebColor;
 using WebKit::WebColorName;
 using WebKit::WebConsoleMessage;
 using WebKit::WebContextMenuData;
 using WebKit::WebData;
 using WebKit::WebDataSource;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDragData;
 using WebKit::WebDragOperation;
@@ skipping 962 matching lines @@
   }
 
   last_page_id_sent_to_browser_ =
       std::max(last_page_id_sent_to_browser_, page_id_);
 
   // If we end up reusing this WebRequest (for example, due to a #ref click),
   // we don't want the transition type to persist.  Just clear it.
   navigation_state->set_transition_type(PageTransition::LINK);
 
 #if defined(OS_WIN)
-  if (web_accessibility_manager_.get()) {
+  if (accessibility_.get()) {
     // Clear accessibility info cache.
-    web_accessibility_manager_->ClearAccObjMap(-1, true);
+    accessibility_->clear();
   }
 #else
   // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
 #endif
 }
 
 // Tell the embedding application that the title of the active page has changed
 void RenderView::UpdateTitle(WebFrame* frame, const string16& title) {
   // Ignore all but top level navigations...
   if (!frame->parent()) {
@@ skipping 2021 matching lines @@
 void RenderView::OnUpdateBackForwardListCount(int back_list_count,
                                               int forward_list_count) {
   history_back_list_count_ = back_list_count;
   history_forward_list_count_ = forward_list_count;
 }
 
 void RenderView::OnGetAccessibilityInfo(
     const webkit_glue::WebAccessibility::InParams& in_params,
     webkit_glue::WebAccessibility::OutParams* out_params) {
 #if defined(OS_WIN)
-  if (!web_accessibility_manager_.get()) {
-    web_accessibility_manager_.reset(
-        webkit_glue::WebAccessibilityManager::Create());
+  if (!accessibility_.get()) {
+    // TODO(dglazkov): Once implemented for all ports, remove lazy
+    // instantiation of accessibility_.
+    accessibility_.reset(WebAccessibilityCache::create());
+    accessibility_->initialize(webview());
   }
 
-  if (!web_accessibility_manager_->GetAccObjInfo(webview(), in_params,
-                                                 out_params)) {
-    return;
-  }
+  webkit_glue::WebAccessibility::GetAccObjInfo(accessibility_.get(),
+                                               in_params,
+                                               out_params);
+
 #else  // defined(OS_WIN)
   // TODO(port): accessibility not yet implemented
   NOTIMPLEMENTED();
 #endif
 }
 
 void RenderView::OnClearAccessibilityInfo(int acc_obj_id, bool clear_all) {
 #if defined(OS_WIN)
-  if (!web_accessibility_manager_.get()) {
+  if (!accessibility_.get()) {
     // If accessibility is not activated, ignore clearing message.
     return;
   }
 
-  if (!web_accessibility_manager_->ClearAccObjMap(acc_obj_id, clear_all))
+  if (clear_all) {
+    accessibility_->clear();
     return;
+  }
+
+  accessibility_->remove(acc_obj_id);
 
 #else  // defined(OS_WIN)
   // TODO(port): accessibility not yet implemented
   NOTIMPLEMENTED();
 #endif
 }
 
 void RenderView::OnGetAllSavableResourceLinksForCurrentPage(
     const GURL& page_url) {
   // Prepare list to storage all savable resource links.
@@ skipping 446 matching lines @@
   // TODO(mbelshe): should we log more stats?
   LOG(INFO) << "PLT: "
             << (finish - start).InMilliseconds()
             << "ms "
             << url.spec();
 }
 
 void RenderView::focusAccessibilityObject(
     const WebAccessibilityObject& acc_obj) {
 #if defined(OS_WIN)
-  if (!web_accessibility_manager_.get()) {
-    web_accessibility_manager_.reset(
-        webkit_glue::WebAccessibilityManager::Create());
-  }
+  // TODO(dglazkov): Current logic implies that focus 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.
+  if (!accessibility_.get())
+    return;
 
   // Retrieve the accessibility object id of the AccessibilityObject.
-  int acc_obj_id = web_accessibility_manager_->FocusAccObj(acc_obj);
+  int acc_obj_id = accessibility_->addOrGetId(acc_obj);
 
   // If id is valid, alert the browser side that an accessibility focus change
   // occurred.
   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
@@ skipping 103 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }