Add a big grab bag of missing web accessibility functionality...

content/renderer/render_view.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 "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 256 matching lines @@
 static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
   WebVector<WebURL> urls;
   ds->redirectChain(urls);
   result->reserve(urls.size());
   for (size_t i = 0; i < urls.size(); ++i)
     result->push_back(urls[i]);
 }
 
 static bool WebAccessibilityNotificationToViewHostMsg(
     WebAccessibilityNotification notification,
-    ViewHostMsg_AccessibilityNotification_Type::Value* type) {
+    ViewHostMsg_AccEvent::Value* type) {
   switch (notification) {
+    case WebKit::WebAccessibilityNotificationActiveDescendantChanged:
+      *type = ViewHostMsg_AccEvent::ACTIVE_DESCENDANT_CHANGED;
+      break;
     case WebKit::WebAccessibilityNotificationCheckedStateChanged:
-      *type = ViewHostMsg_AccessibilityNotification_Type::
-          NOTIFICATION_TYPE_CHECK_STATE_CHANGED;
+      *type = ViewHostMsg_AccEvent::CHECK_STATE_CHANGED;
       break;
     case WebKit::WebAccessibilityNotificationChildrenChanged:
-      *type = ViewHostMsg_AccessibilityNotification_Type::
-          NOTIFICATION_TYPE_CHILDREN_CHANGED;
+      *type = ViewHostMsg_AccEvent::CHILDREN_CHANGED;
       break;
     case WebKit::WebAccessibilityNotificationFocusedUIElementChanged:
-      *type = ViewHostMsg_AccessibilityNotification_Type::
-           NOTIFICATION_TYPE_FOCUS_CHANGED;
+      *type = ViewHostMsg_AccEvent::FOCUS_CHANGED;
+      break;
+    case WebKit::WebAccessibilityNotificationLayoutComplete:
+      *type = ViewHostMsg_AccEvent::LAYOUT_COMPLETE;
+      break;
+    case WebKit::WebAccessibilityNotificationLiveRegionChanged:
+      *type = ViewHostMsg_AccEvent::LIVE_REGION_CHANGED;
       break;
     case WebKit::WebAccessibilityNotificationLoadComplete:
-      *type = ViewHostMsg_AccessibilityNotification_Type::
-          NOTIFICATION_TYPE_LOAD_COMPLETE;
+      *type = ViewHostMsg_AccEvent::LOAD_COMPLETE;
+      break;
+    case WebKit::WebAccessibilityNotificationMenuListValueChanged:
+      *type = ViewHostMsg_AccEvent::MENU_LIST_VALUE_CHANGED;
+      break;
+    case WebKit::WebAccessibilityNotificationRowCollapsed:
+      *type = ViewHostMsg_AccEvent::ROW_COLLAPSED;
+      break;
+    case WebKit::WebAccessibilityNotificationRowCountChanged:
+      *type = ViewHostMsg_AccEvent::ROW_COUNT_CHANGED;
+      break;
+    case WebKit::WebAccessibilityNotificationRowExpanded:
+      *type = ViewHostMsg_AccEvent::ROW_EXPANDED;
+      break;
+    case WebKit::WebAccessibilityNotificationScrolledToAnchor:
+      *type = ViewHostMsg_AccEvent::SCROLLED_TO_ANCHOR;
+      break;
+    case WebKit::WebAccessibilityNotificationSelectedChildrenChanged:
+      *type = ViewHostMsg_AccEvent::SELECTED_CHILDREN_CHANGED;
+      break;
+    case WebKit::WebAccessibilityNotificationSelectedTextChanged:
+      *type = ViewHostMsg_AccEvent::SELECTED_TEXT_CHANGED;
       break;
     case WebKit::WebAccessibilityNotificationValueChanged:
-      *type = ViewHostMsg_AccessibilityNotification_Type::
-          NOTIFICATION_TYPE_VALUE_CHANGED;
-      break;
-    case WebKit::WebAccessibilityNotificationSelectedTextChanged:
-      *type = ViewHostMsg_AccessibilityNotification_Type::
-          NOTIFICATION_TYPE_SELECTED_TEXT_CHANGED;
+      *type = ViewHostMsg_AccEvent::VALUE_CHANGED;
       break;
     default:
-      // TODO(ctguil): Support additional webkit notifications.
       return false;
   }
   return true;
 }
 
 // If |data_source| is non-null and has a NavigationState associated with it,
 // the AltErrorPageResourceFetcher is reset.
 static void StopAltErrorPageFetcher(WebDataSource* data_source) {
   if (data_source) {
     NavigationState* state = NavigationState::FromDataSource(data_source);
@@ skipping 43 matching lines @@
       cached_is_main_frame_pinned_to_right_(false),
       cached_has_main_frame_horizontal_scrollbar_(false),
       cached_has_main_frame_vertical_scrollbar_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(accessibility_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
       geolocation_dispatcher_(NULL),
       speech_input_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
       accessibility_ack_pending_(false),
+      accessibility_logging_(false),
       p2p_socket_dispatcher_(NULL),
       devtools_agent_(NULL),
       session_storage_namespace_id_(session_storage_namespace_id),
       handling_select_range_(false) {
   routing_id_ = routing_id;
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
   webwidget_ = WebView::create(this);
 
@@ skipping 29 matching lines @@
       is_hidden() ? webkit_glue::kBackgroundTabTimerInterval :
           webkit_glue::kForegroundTabTimerInterval);
 
   OnSetRendererPrefs(renderer_prefs);
 
   host_window_ = parent_hwnd;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableAccessibility))
     WebAccessibilityCache::enableAccessibility();
+  if (command_line.HasSwitch(switches::kEnableAccessibilityLogging))
+    accessibility_logging_ = true;
 
 #if defined(ENABLE_P2P_APIS)
   p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
 #endif
 
   new MHTMLGenerator(this);
 
   devtools_agent_ = new DevToolsAgent(this);
 
   if (command_line.HasSwitch(switches::kEnableMediaStream)) {
@@ skipping 94 matching lines @@
 }
 
 void RenderView::RemoveObserver(RenderViewObserver* observer) {
   observer->set_render_view(NULL);
   observers_.RemoveObserver(observer);
 }
 
 bool RenderView::RendererAccessibilityNotification::ShouldIncludeChildren() {
   typedef ViewHostMsg_AccessibilityNotification_Params params;
   if (type == WebKit::WebAccessibilityNotificationChildrenChanged ||
-      type == WebKit::WebAccessibilityNotificationLoadComplete) {
+      type == WebKit::WebAccessibilityNotificationLoadComplete ||
+      type == WebKit::WebAccessibilityNotificationLiveRegionChanged) {
     return true;
   }
   return false;
 }
 
 WebKit::WebView* RenderView::webview() const {
   return static_cast<WebKit::WebView*>(webwidget());
 }
 
 void RenderView::SetReportLoadProgressEnabled(bool enabled) {
@@ skipping 1047 matching lines @@
     return;
 
   if (pending_accessibility_notifications_.empty())
     return;
 
   // Send all pending accessibility notifications.
   std::vector<ViewHostMsg_AccessibilityNotification_Params> notifications;
   for (size_t i = 0; i < pending_accessibility_notifications_.size(); i++) {
     RendererAccessibilityNotification& notification =
         pending_accessibility_notifications_[i];
-    WebAccessibilityObject obj = accessibility_->getObjectById(notification.id);
+    WebAccessibilityObject obj = accessibility_->getObjectById(
+        notification.id);
     if (!obj.isValid())
       continue;
 
     ViewHostMsg_AccessibilityNotification_Params param;
     WebAccessibilityNotificationToViewHostMsg(
-        pending_accessibility_notifications_[i].type, &param.notification_type);
+        pending_accessibility_notifications_[i].type,
+        &param.notification_type);
     param.acc_obj = WebAccessibility(
         obj, accessibility_.get(), notification.ShouldIncludeChildren());
     notifications.push_back(param);
+
+    if (accessibility_logging_) {
+      LOG(INFO) << "Accessibility update: \n"
+                << param.acc_obj.DebugString(true);
+    }
   }
   pending_accessibility_notifications_.clear();
   Send(new ViewHostMsg_AccessibilityNotifications(routing_id_, notifications));
   accessibility_ack_pending_ = true;
 }
 
 bool RenderView::handleCurrentKeyboardEvent() {
   if (edit_commands_.empty())
     return false;
 
@@ skipping 2493 matching lines @@
       return;
   }
 
   // Add the accessibility object to our cache and ensure it's valid.
   RendererAccessibilityNotification acc_notification;
   acc_notification.id = accessibility_->addOrGetId(obj);
   acc_notification.type = notification;
   if (acc_notification.id < 0)
     return;
 
-  ViewHostMsg_AccessibilityNotification_Type::Value temp;
+  ViewHostMsg_AccEvent::Value temp;
   if (!WebAccessibilityNotificationToViewHostMsg(notification, &temp))
     return;
 
   // Discard duplicate accessibility notifications.
   for (uint32 i = 0; i < pending_accessibility_notifications_.size(); i++) {
     if (pending_accessibility_notifications_[i].id == acc_notification.id &&
         pending_accessibility_notifications_[i].type == acc_notification.type) {
       return;
     }
   }
@@ skipping 452 matching lines @@
 }
 
 void RenderView::OnEnableViewSourceMode() {
   if (!webview())
     return;
   WebFrame* main_frame = webview()->mainFrame();
   if (!main_frame)
     return;
   main_frame->enableViewSourceMode(true);
 }