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

views/accessibility/native_view_accessibility_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 "views/accessibility/native_view_accessibility_win.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/view_prop.h"
 #include "views/controls/button/native_button.h"
 #include "views/widget/native_widget_win.h"
@@ skipping 10 matching lines @@
 scoped_refptr<NativeViewAccessibilityWin> NativeViewAccessibilityWin::Create(
     views::View* view) {
   CComObject<NativeViewAccessibilityWin>* instance = NULL;
   HRESULT hr = CComObject<NativeViewAccessibilityWin>::CreateInstance(
       &instance);
   DCHECK(SUCCEEDED(hr));
   instance->set_view(view);
   return scoped_refptr<NativeViewAccessibilityWin>(instance);
 }
 
-// static
-IAccessible* NativeViewAccessibilityWin::GetAccessibleForView(
-    views::View* view) {
-  IAccessible* accessible = NULL;
-
-  // First, check to see if the view is a native view.
-  if (view->GetClassName() == views::NativeViewHost::kViewClassName) {
-    views::NativeViewHost* native_host =
-        static_cast<views::NativeViewHost*>(view);
-    if (GetNativeIAccessibleInterface(native_host, &accessible) == S_OK)
-      return accessible;
-  }
-
-  // Next, see if the view is a widget container.
-  if (view->GetChildWidget()) {
-    views::NativeWidgetWin* native_widget =
-      reinterpret_cast<views::NativeWidgetWin*>(view->GetChildWidget());
-    if (GetNativeIAccessibleInterface(
-        native_widget->GetNativeView(), &accessible) == S_OK) {
-      return accessible;
-    }
-  }
-
-  // Finally, use our NativeViewAccessibilityWin implementation.
-  return view->GetNativeViewAccessibilityWin();
-}
-
 NativeViewAccessibilityWin::NativeViewAccessibilityWin() : view_(NULL) {
 }
 
 NativeViewAccessibilityWin::~NativeViewAccessibilityWin() {
 }
 
 // TODO(ctguil): Handle case where child View is not contained by parent.
 STDMETHODIMP NativeViewAccessibilityWin::accHitTest(
     LONG x_left, LONG y_top, VARIANT* child) {
   if (!child)
@@ skipping 11 matching lines @@
     return S_FALSE;
   }
 
   views::View* view = view_->GetEventHandlerForPoint(point);
   if (view == view_) {
     // No child hit, return parent id.
     child->vt = VT_I4;
     child->lVal = CHILDID_SELF;
   } else {
     child->vt = VT_DISPATCH;
-    child->pdispVal = GetAccessibleForView(view);
+    child->pdispVal = view->GetNativeViewAccessible();
     child->pdispVal->AddRef();
   }
   return S_OK;
 }
 
 HRESULT NativeViewAccessibilityWin::accDoDefaultAction(VARIANT var_id) {
   if (!IsValidId(var_id))
     return E_INVALIDARG;
 
   if (view_->GetClassName() == views::NativeButton::kViewClassName) {
@@ skipping 49 matching lines @@
         return S_FALSE;
       }
 
       // Set child_id based on first or last child.
       int child_id = 0;
       if (nav_dir == NAVDIR_LASTCHILD)
         child_id = view_->child_count() - 1;
 
       views::View* child = view_->GetChildViewAt(child_id);
       end->vt = VT_DISPATCH;
-      end->pdispVal = GetAccessibleForView(child);
+      end->pdispVal = child->GetNativeViewAccessible();
       end->pdispVal->AddRef();
       return S_OK;
     }
     case NAVDIR_LEFT:
     case NAVDIR_UP:
     case NAVDIR_PREVIOUS:
     case NAVDIR_RIGHT:
     case NAVDIR_DOWN:
     case NAVDIR_NEXT: {
       // Retrieve parent to access view index and perform bounds checking.
@@ skipping 13 matching lines @@
           return S_FALSE;
         } else {
           if (IsNavDirNext(nav_dir)) {
             view_index += 1;
           } else {
             view_index -=1;
           }
         }
 
         views::View* child = parent->GetChildViewAt(view_index);
-        end->pdispVal = GetAccessibleForView(child);
+        end->pdispVal = child->GetNativeViewAccessible();
         end->vt = VT_DISPATCH;
         end->pdispVal->AddRef();
         return S_OK;
       } else {
         // Check navigation bounds, adjusting for MSAA child indexing (MSAA
         // child indexing starts with 1, whereas View indexing starts with 0).
         if (!IsValidNav(nav_dir, start.lVal, 0, parent->child_count() + 1)) {
             // Navigation attempted to go out-of-bounds.
             end->vt = VT_EMPTY;
             return S_FALSE;
@@ skipping 59 matching lines @@
         view_->GetWidget()->native_widget());
     child_view = widget->GetAccessibilityViewEventAt(child_id);
   }
 
   if (!child_view) {
     // No child found.
     *disp_child = NULL;
     return E_FAIL;
   }
 
-  *disp_child = GetAccessibleForView(child_view);
+  *disp_child = child_view->GetNativeViewAccessible();
   (*disp_child)->AddRef();
   return S_OK;
 }
 
 STDMETHODIMP NativeViewAccessibilityWin::get_accChildCount(LONG* child_count) {
   if (!child_count || !view_)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
@@ skipping 53 matching lines @@
   views::View* focus = NULL;
   views::FocusManager* focus_manager = view_->GetFocusManager();
   if (focus_manager)
     focus = focus_manager->GetFocusedView();
   if (focus == view_) {
     // This view has focus.
     focus_child->vt = VT_I4;
     focus_child->lVal = CHILDID_SELF;
   } else if (focus && view_->Contains(focus)) {
     // Return the child object that has the keyboard focus.
-    focus_child->pdispVal = GetAccessibleForView(focus);
+    focus_child->pdispVal = focus->GetNativeViewAccessible();
     focus_child->pdispVal->AddRef();
     return S_OK;
   } else {
     // Neither this object nor any of its children has the keyboard focus.
     focus_child->vt = VT_EMPTY;
   }
   return S_OK;
 }
 
 STDMETHODIMP NativeViewAccessibilityWin::get_accKeyboardShortcut(
@@ skipping 67 matching lines @@
                                      reinterpret_cast<void**>(disp_parent));
 
     if (!SUCCEEDED(hr)) {
       *disp_parent = NULL;
       return S_FALSE;
     }
 
     return S_OK;
   }
 
-  *disp_parent = GetAccessibleForView(parent_view);
+  *disp_parent = parent_view->GetNativeViewAccessible();
   (*disp_parent)->AddRef();
   return S_OK;
 }
 
 STDMETHODIMP NativeViewAccessibilityWin::get_accRole(
     VARIANT var_id, VARIANT* role) {
   if (!IsValidId(var_id) || !role)
     return E_INVALIDARG;
 
   if (!view_)
@@ skipping 271 matching lines @@
   if (state & AccessibilityTypes::STATE_READONLY)
     msaa_state |= STATE_SYSTEM_READONLY;
   if (state & AccessibilityTypes::STATE_SELECTED)
     msaa_state |= STATE_SYSTEM_SELECTED;
   if (state & AccessibilityTypes::STATE_FOCUSED)
     msaa_state |= STATE_SYSTEM_FOCUSED;
   if (state & AccessibilityTypes::STATE_UNAVAILABLE)
     msaa_state |= STATE_SYSTEM_UNAVAILABLE;
   return msaa_state;
 }
-
-// static
-HRESULT NativeViewAccessibilityWin::GetNativeIAccessibleInterface(
-    views::NativeViewHost* native_host, IAccessible** accessible) {
-  if (!native_host || !accessible)
-    return E_INVALIDARG;
-
-  HWND native_view_window = static_cast<HWND>(
-      ui::ViewProp::GetValue(native_host->native_view(),
-                             views::kViewsNativeHostPropForAccessibility));
-  if (!IsWindow(native_view_window)) {
-    native_view_window = native_host->native_view();
-  }
-
-  return GetNativeIAccessibleInterface(native_view_window, accessible);
-}
-
-// static
-HRESULT NativeViewAccessibilityWin::GetNativeIAccessibleInterface(
-    HWND native_view_window , IAccessible** accessible) {
-  if (IsWindow(native_view_window)) {
-    LRESULT ret = SendMessage(native_view_window, WM_GETOBJECT, 0,
-                              OBJID_CLIENT);
-    return ObjectFromLresult(ret, IID_IDispatch, 0,
-                             reinterpret_cast<void**>(accessible));
-  }
-
-  return E_FAIL;
-}