Fix a few lingering bugs in BrowserAccessibilityManager and BrowserAccessibilityCocoa.

chrome/browser/renderer_host/render_widget_host_view_win.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 "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 1426 matching lines @@
   handled = FALSE;
   render_widget_host_->OnMouseActivate();
   return MA_ACTIVATE;
 }
 
 void RenderWidgetHostViewWin::OnAccessibilityNotifications(
     const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
   if (!browser_accessibility_manager_.get()) {
     // Use empty document to process notifications
     webkit_glue::WebAccessibility empty_document;
-    empty_document.role = WebAccessibility::ROLE_DOCUMENT;
+    // Renderer id's always start at 1000 as determined by webkit. Boot strap
+    // our ability to reuse BrowserAccessibility instances.
+    empty_document.id = 1000;
+    empty_document.role = WebAccessibility::ROLE_WEB_AREA;
     empty_document.state = 0;
     browser_accessibility_manager_.reset(
         BrowserAccessibilityManager::Create(m_hWnd, empty_document, this));
   }
 
   browser_accessibility_manager_->OnAccessibilityNotifications(params);
 }
 
 void RenderWidgetHostViewWin::Observe(int type,
                                       const NotificationSource& source,
@@ skipping 161 matching lines @@
 
 IAccessible* RenderWidgetHostViewWin::GetIAccessible() {
   if (render_widget_host_ && !render_widget_host_->renderer_accessible()) {
     // Attempt to detect screen readers by sending an event with our custom id.
     NotifyWinEvent(EVENT_SYSTEM_ALERT, m_hWnd, kIdCustom, CHILDID_SELF);
   }
 
   if (!browser_accessibility_manager_.get()) {
     // Return busy document tree while renderer accessibility tree loads.
     webkit_glue::WebAccessibility loading_tree;
-    loading_tree.role = WebAccessibility::ROLE_DOCUMENT;
+    loading_tree.id = 1000;
+    loading_tree.role = WebAccessibility::ROLE_WEB_AREA;
     loading_tree.state = (1 << WebAccessibility::STATE_BUSY);
     browser_accessibility_manager_.reset(
       BrowserAccessibilityManager::Create(m_hWnd, loading_tree, this));
   }
 
   return browser_accessibility_manager_->GetRoot()->toBrowserAccessibilityWin();
 }
 
 LRESULT RenderWidgetHostViewWin::OnGetObject(UINT message, WPARAM wparam,
                                              LPARAM lparam, BOOL& handled) {
@@ skipping 177 matching lines @@
                                                       DWORD ex_style) {
   parent_hwnd_ = parent_hwnd;
   Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
   // To show tooltip on popup window.(e.g. title in <select>)
   // Popups default to showing, which means |DidBecomeSelected()| isn't invoked.
   // Ensure the tooltip is created otherwise tooltips are never shown.
   EnsureTooltip();
   ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
 }