Fix race in BrowserAccessibilityManagerWin creation.

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 8f2cd85c5c5eab8e4b7f2469904f0eb472d36d43..69c4ffbbbb077b36bec0cde868a7ef65625818fb 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1019,6 +1019,11 @@ void RenderWidgetHostViewAura::InternalSetBounds(const gfx::Rect& rect) {
     if (!legacy_render_widget_host_HWND_) {
       legacy_render_widget_host_HWND_ = LegacyRenderWidgetHostHWND::Create(
           reinterpret_cast<HWND>(GetNativeViewId()));
+      BrowserAccessibilityManager* manager = GetBrowserAccessibilityManager();
+      if (manager) {
+        legacy_render_widget_host_HWND_->set_browser_accessibility_manager(

[ananta, 2014/06/12 18:30:17]

This will crash in Windows 8 ASH. You may want to move this code below under the
if (legacy_render_widget_host_HWND_) block.

+            static_cast<BrowserAccessibilityManagerWin*>(manager));
+      }
     }
     if (legacy_render_widget_host_HWND_) {
       legacy_render_widget_host_HWND_->SetBounds(
@@ -1095,12 +1100,16 @@ void RenderWidgetHostViewAura::OnSwapCompositorFrame(
 }
 
 #if defined(OS_WIN)
-void RenderWidgetHostViewAura::SetParentNativeViewAccessible(
-    gfx::NativeViewAccessible accessible_parent) {
-  if (GetBrowserAccessibilityManager()) {
-    GetBrowserAccessibilityManager()->ToBrowserAccessibilityManagerWin()
-        ->set_parent_iaccessible(accessible_parent);
-  }
+HWND RenderWidgetHostViewAura::GetAccessibleParentHWND() const {
+  if (!legacy_render_widget_host_HWND_)
+    return NULL;
+  return legacy_render_widget_host_HWND_->hwnd();
+}
+
+IAccessible* RenderWidgetHostViewAura::GetParentIAccessible() const {
+  if (!legacy_render_widget_host_HWND_)
+    return NULL;
+  return legacy_render_widget_host_HWND_->window_accessible();
 }
 
 gfx::NativeViewId RenderWidgetHostViewAura::GetParentForWindowlessPlugin()
@@ -1256,22 +1265,11 @@ void RenderWidgetHostViewAura::CreateBrowserAccessibilityManagerIfNeeded() {
 
   BrowserAccessibilityManager* manager = NULL;
 #if defined(OS_WIN)
-  aura::WindowTreeHost* host = window_->GetHost();
-  if (!host)
-    return;
-  HWND hwnd = host->GetAcceleratedWidget();
-
-  // The accessible_parent may be NULL at this point. The WebContents will pass
-  // it down to this instance (by way of the RenderViewHost and
-  // RenderWidgetHost) when it is known. This instance will then set it on its
-  // BrowserAccessibilityManager.
-  gfx::NativeViewAccessible accessible_parent =
-      host_->GetParentNativeViewAccessible();
-
+  manager = new BrowserAccessibilityManagerWin(
+      BrowserAccessibilityManagerWin::GetEmptyDocument(), host_);
   if (legacy_render_widget_host_HWND_) {
-    manager = new BrowserAccessibilityManagerWin(
-        legacy_render_widget_host_HWND_.get(), accessible_parent,
-        BrowserAccessibilityManagerWin::GetEmptyDocument(), host_);
+    legacy_render_widget_host_HWND_->set_browser_accessibility_manager(
+        static_cast<BrowserAccessibilityManagerWin*>(manager));
   }
 #else
   manager = BrowserAccessibilityManager::Create(
@@ -2191,6 +2189,8 @@ RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
   DetachFromInputMethod();
 
 #if defined(OS_WIN)
+  if (legacy_render_widget_host_HWND_.get())
+    legacy_render_widget_host_HWND_->OnManagerDeleted();
   legacy_render_widget_host_HWND_.reset(NULL);
 #endif
 }