Support additional webkit accessibility notifications and states.

chrome/browser/browser_accessibility_manager_win.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/browser/browser_accessibility_manager_win.h"
 
 #include "chrome/browser/browser_accessibility_win.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/render_messages.h"
@@ skipping 82 matching lines @@
   if (delegate_)
     delegate_->SetAccessibilityFocus(node.renderer_id());
 }
 
 void BrowserAccessibilityManager::DoDefaultAction(
     const BrowserAccessibility& node) {
   if (delegate_)
     delegate_->AccessibilityDoDefaultAction(node.renderer_id());
 }
 
-void BrowserAccessibilityManager::OnAccessibilityFocusChange(int renderer_id) {
-  base::hash_map<int, LONG>::iterator iter =
-      renderer_id_to_child_id_map_.find(renderer_id);
-  if (iter == renderer_id_to_child_id_map_.end())
-    return;
-
-  LONG child_id = iter->second;
-  base::hash_map<LONG, BrowserAccessibility*>::iterator uniq_iter =
-    child_id_map_.find(child_id);
-  if (uniq_iter != child_id_map_.end())
-    focus_ = uniq_iter->second;
-  ::NotifyWinEvent(EVENT_OBJECT_FOCUS, parent_hwnd_, OBJID_CLIENT, child_id);
-}
-
 void BrowserAccessibilityManager::OnAccessibilityNotifications(
     const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
   if (delegate_)
     delegate_->AccessibilityNotificationsAck();
 
   for (uint32 index = 0; index < params.size(); index++) {
     const ViewHostMsg_AccessibilityNotification_Params& param = params[index];
 
     switch (param.notification_type) {
       case ViewHostMsg_AccessibilityNotification_Params::
           NOTIFICATION_TYPE_CHECK_STATE_CHANGED:
         OnAccessibilityObjectStateChange(param.acc_obj);
         break;
       case ViewHostMsg_AccessibilityNotification_Params::
           NOTIFICATION_TYPE_CHILDREN_CHANGED:
         OnAccessibilityObjectChildrenChange(param.acc_obj);
         break;
       case ViewHostMsg_AccessibilityNotification_Params::
+          NOTIFICATION_TYPE_FOCUS_CHANGED:
+        OnAccessibilityObjectFocusChange(param.acc_obj);
+        break;
+      case ViewHostMsg_AccessibilityNotification_Params::
+          NOTIFICATION_TYPE_LOAD_COMPLETE:
+        OnAccessibilityObjectLoadComplete(param.acc_obj);
+        break;
+      case ViewHostMsg_AccessibilityNotification_Params::
           NOTIFICATION_TYPE_VALUE_CHANGED:
         OnAccessibilityObjectValueChange(param.acc_obj);
         break;
       default:
         DCHECK(0);
         break;
     }
   }
 }
 
@@ skipping 62 matching lines @@
   LONG child_id;
   if (root_ != new_browser_acc) {
     child_id = new_browser_acc->GetParent()->child_id();
   } else {
     child_id = CHILDID_SELF;
   }
 
   NotifyWinEvent(EVENT_OBJECT_REORDER, parent_hwnd_, OBJID_CLIENT, child_id);
 }
 
+void BrowserAccessibilityManager::OnAccessibilityObjectFocusChange(
+  const webkit_glue::WebAccessibility& acc_obj) {
+  BrowserAccessibility* new_browser_acc = UpdateTree(acc_obj);
+  if (!new_browser_acc)
+    return;
+
+  focus_ = new_browser_acc;
+  LONG child_id = new_browser_acc->child_id();
+  NotifyWinEvent(EVENT_OBJECT_FOCUS, parent_hwnd_, OBJID_CLIENT, child_id);
+}
+
+void BrowserAccessibilityManager::OnAccessibilityObjectLoadComplete(
+  const webkit_glue::WebAccessibility& acc_obj) {
+  root_->InactivateTree();
+  root_->Release();
+  focus_ = NULL;
+
+  root_ = CreateAccessibilityTree(NULL, GetNextChildID(), acc_obj, 0);
+  if (!focus_)
+    focus_ = root_;
+
+  LONG root_id = root_->child_id();
+  NotifyWinEvent(EVENT_OBJECT_FOCUS, parent_hwnd_, OBJID_CLIENT, root_id);
+  NotifyWinEvent(
+    IA2_EVENT_DOCUMENT_LOAD_COMPLETE, parent_hwnd_, OBJID_CLIENT, root_id);
+}
+
 void BrowserAccessibilityManager::OnAccessibilityObjectValueChange(
     const webkit_glue::WebAccessibility& acc_obj) {
   BrowserAccessibility* new_browser_acc = UpdateTree(acc_obj);
   if (!new_browser_acc)
     return;
 
   LONG child_id = new_browser_acc->child_id();
   NotifyWinEvent(
       EVENT_OBJECT_VALUECHANGE, parent_hwnd_, OBJID_CLIENT, child_id);
 }
@@ skipping 23 matching lines @@
   if ((src.state >> WebAccessibility::STATE_FOCUSED) & 1)
     focus_ = instance;
   for (int i = 0; i < static_cast<int>(src.children.size()); ++i) {
     BrowserAccessibility* child = CreateAccessibilityTree(
         instance, GetNextChildID(), src.children[i], i);
     instance->AddChild(child);
   }
 
   return instance;
 }