Rename confusing child_id to unique_id_win

content/browser/accessibility/browser_accessibility_manager_win.cc

 // Copyright (c) 2012 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/browser/accessibility/browser_accessibility_manager_win.h"
 
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/common/accessibility_messages.h"
 
 namespace content {
@@ skipping 35 matching lines @@
 AccessibilityNodeData BrowserAccessibilityManagerWin::GetEmptyDocument() {
   AccessibilityNodeData empty_document;
   empty_document.id = 0;
   empty_document.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
   empty_document.state =
       (1 << AccessibilityNodeData::STATE_READONLY) |
       (1 << AccessibilityNodeData::STATE_BUSY);
   return empty_document;
 }
 
+void BrowserAccessibilityManagerWin::InitializeNode(
+    BrowserAccessibility* node) {
+  BrowserAccessibilityManager::InitializeNode(node);
+  LONG unique_id_win = node->ToBrowserAccessibilityWin()->unique_id_win();
+  unique_id_to_renderer_id_map_[unique_id_win] = node->renderer_id();
+}
+
+void BrowserAccessibilityManagerWin::RemoveNode(BrowserAccessibility* node) {
+  unique_id_to_renderer_id_map_.erase(
+      node->ToBrowserAccessibilityWin()->unique_id_win());
+  BrowserAccessibilityManager::RemoveNode(node);
+}
+
 void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent(
     int type,
     BrowserAccessibility* node) {
   LONG event_id = EVENT_MIN;
   switch (type) {
     case AccessibilityNotificationActiveDescendantChanged:
       event_id = IA2_EVENT_ACTIVE_DESCENDANT_CHANGED;
       break;
     case AccessibilityNotificationAlert:
       event_id = EVENT_SYSTEM_ALERT;
@@ skipping 62 matching lines @@
       break;
     case AccessibilityNotificationValueChanged:
       event_id = EVENT_OBJECT_VALUECHANGE;
       break;
     default:
       // Not all WebKit accessibility events result in a Windows
       // accessibility notification.
       break;
   }
 
+  LONG child_id = node->ToBrowserAccessibilityWin()->unique_id_win();

[aboxhall, 2013/04/09 09:28:29]

Should this be renamed unique_id_win as well?

[dmazzoni, 2013/04/09 19:44:04]

The argument to NotifyWinEvent is called "child id", so
I wanted to be clear. I added a comment.

+
   if (event_id != EVENT_MIN)
-    NotifyWinEvent(event_id, parent_hwnd(), OBJID_CLIENT, node->child_id());
+    NotifyWinEvent(event_id, parent_hwnd(), OBJID_CLIENT, child_id);
 
   // If this is a layout complete notification (sent when a container scrolls)
   // and there is a descendant tracked object, send a notification on it.
   // TODO(dmazzoni): remove once http://crbug.com/113483 is fixed.
   if (type == AccessibilityNotificationLayoutComplete &&
       tracked_scroll_object_ &&
       tracked_scroll_object_->IsDescendantOf(node)) {
-    NotifyWinEvent(IA2_EVENT_VISIBLE_DATA_CHANGED,
-                   parent_hwnd(),
-                   OBJID_CLIENT,
-                   tracked_scroll_object_->child_id());
+    NotifyWinEvent(
+        IA2_EVENT_VISIBLE_DATA_CHANGED,
+        parent_hwnd(),
+        OBJID_CLIENT,
+        tracked_scroll_object_->ToBrowserAccessibilityWin()->unique_id_win());
     tracked_scroll_object_->Release();
     tracked_scroll_object_ = NULL;
   }
 }
 
 void BrowserAccessibilityManagerWin::TrackScrollingObject(
     BrowserAccessibilityWin* node) {
   if (tracked_scroll_object_)
     tracked_scroll_object_->Release();
   tracked_scroll_object_ = node;
   tracked_scroll_object_->AddRef();
 }
 
+BrowserAccessibilityWin* BrowserAccessibilityManagerWin::GetFromUniqueIdWin(
+    LONG unique_id_win) {
+  base::hash_map<LONG, int32>::iterator iter =
+      unique_id_to_renderer_id_map_.find(unique_id_win);
+  if (iter != unique_id_to_renderer_id_map_.end()) {
+    BrowserAccessibility* result = GetFromRendererID(iter->second);
+    if (result)
+      return result->ToBrowserAccessibilityWin();
+  }
+  return NULL;
+}
+
 }  // namespace content