Fix support for AccessibleObjectFromPoint on page navigation

chrome/browser/renderer_host/render_widget_host_view_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/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 547 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(),
+                                         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 237 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin, private:
 
 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));
-  // Save away our HWND in the parent window as a property so that the
-  // accessibility code can find it.
-  props_.push_back(new ViewProp(GetParent(),
-                                kViewsNativeHostPropForAccessibility,
-                                m_hWnd));
   props_.push_back(new ViewProp(m_hWnd, kRenderWidgetHostViewKey,
                                 static_cast<RenderWidgetHostView*>(this)));
   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) {
@@ skipping 957 matching lines @@
 }
 
 // static
 RenderWidgetHostView*
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView native_view) {
   return ::IsWindow(native_view) ?
       reinterpret_cast<RenderWidgetHostView*>(
           ViewProp::GetValue(native_view, kRenderWidgetHostViewKey)) : NULL;
 }