Make web content accessibility tree a descendant of main window's tree again

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 490 matching lines @@
 bool RenderWidgetHostViewWin::HasFocus() {
   return ::GetFocus() == m_hWnd;
 }
 
 void RenderWidgetHostViewWin::Show() {
   DCHECK(parent_hwnd_);
   DCHECK(parent_hwnd_ != GetDesktopWindow());
   SetParent(parent_hwnd_);
   ShowWindow(SW_SHOW);
 
-  // Save away our HWND in the parent window as a property so that the
-  // accessibility code can find it.
-  accessibility_prop_.reset(new ViewProp(
-      GetParent(),
-      views::kViewsNativeHostPropForAccessibility,
-      m_hWnd));
-
   DidBecomeSelected();
 }
 
 void RenderWidgetHostViewWin::Hide() {
   if (GetParent() == GetDesktopWindow()) {
     LOG(WARNING) << "Hide() called twice in a row: " << this << ":" <<
         parent_hwnd_ << ":" << GetParent();
     return;
   }
 
-  accessibility_prop_.reset();
-
   if (::GetFocus() == m_hWnd)
     ::SetFocus(NULL);
   ShowWindow(SW_HIDE);
 
   // Cache the old parent, then orphan the window so we stop receiving messages
   parent_hwnd_ = GetParent();
   SetParent(NULL);
 
   WasHidden();
 }
@@ skipping 239 matching lines @@
 
 LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
   // Call the WM_INPUTLANGCHANGE message handler to initialize the input locale
   // of a browser process.
   OnInputLangChange(0, 0);
   // Marks that window as supporting mouse-wheel messages rerouting so it is
   // scrolled when under the mouse pointer even if inactive.
   props_.push_back(views::SetWindowSupportsRerouteMouseWheel(m_hWnd));
   props_.push_back(new ViewProp(m_hWnd, kRenderWidgetHostViewKey,
                                 static_cast<RenderWidgetHostView*>(this)));
-  // Save away our HWND in the parent window as a property so that the
-  // accessibility code can find it.
-  accessibility_prop_.reset(new ViewProp(
-      GetParent(),
-      views::kViewsNativeHostPropForAccessibility,
-      m_hWnd));
 
   return 0;
 }
 
 void RenderWidgetHostViewWin::OnActivate(UINT action, BOOL minimized,
                                          HWND window) {
   // If the container is a popup, clicking elsewhere on screen should close the
   // popup.
   if (close_on_deactivate_ && action == WA_INACTIVE) {
     // Send a windows message so that any derived classes
@@ skipping 815 matching lines @@
 }
 
 void RenderWidgetHostViewWin::AccessibilityDoDefaultAction(int acc_obj_id) {
   if (!render_widget_host_)
     return;
 
   render_widget_host_->Send(new ViewMsg_AccessibilityDoDefaultAction(
       render_widget_host_->routing_id(), acc_obj_id));
 }
 
+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.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) {
   if (kIdCustom == lparam) {
     // An MSAA client requestes our custom id. Assume that we have detected an
     // active windows screen reader.
     BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
     render_widget_host_->EnableRendererAccessibility();
 
     // Return with failure.
     return static_cast<LRESULT>(0L);
   }
 
   if (lparam != OBJID_CLIENT) {
     handled = false;
     return static_cast<LRESULT>(0L);
   }
 
-  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.state = (1 << WebAccessibility::STATE_BUSY);
-    browser_accessibility_manager_.reset(
-      BrowserAccessibilityManager::Create(m_hWnd, loading_tree, this));
-  }
-
-  base::win::ScopedComPtr<IAccessible> root(
-      browser_accessibility_manager_->GetRoot()->toBrowserAccessibilityWin());
-  if (root.get())
-    return LresultFromObject(IID_IAccessible, wparam, root.Detach());
+  IAccessible* iaccessible = GetIAccessible();
+  if (iaccessible)
+    return LresultFromObject(IID_IAccessible, wparam, iaccessible);
 
   handled = false;
   return static_cast<LRESULT>(0L);
 }
 
 LRESULT RenderWidgetHostViewWin::OnParentNotify(UINT message, WPARAM wparam,
                                                 LPARAM lparam, BOOL& handled) {
   handled = FALSE;
 
   if (!render_widget_host_)
@@ skipping 128 matching lines @@
 }
 
 // static
 RenderWidgetHostView*
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView native_view) {
   return ::IsWindow(native_view) ?
       reinterpret_cast<RenderWidgetHostView*>(
           ViewProp::GetValue(native_view, kRenderWidgetHostViewKey)) : NULL;
 }