diff options
author | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 03:46:47 +0000 |
---|---|---|
committer | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 03:46:47 +0000 |
commit | 5e7e96edffa0494975333c8b3268c34f56a20f74 (patch) | |
tree | 774ea621d85e76ed638921278e291f9c357802f2 /views/accessibility | |
parent | d657f3ccd4c677e916e3b9eb6545d27767092091 (diff) | |
download | chromium_src-5e7e96edffa0494975333c8b3268c34f56a20f74.zip chromium_src-5e7e96edffa0494975333c8b3268c34f56a20f74.tar.gz chromium_src-5e7e96edffa0494975333c8b3268c34f56a20f74.tar.bz2 |
Connect native view accessibles back to the accessibility tree.
BUG=none
TEST=interactive_ui_tests:AccessibilityWinBrowserTest.ContainsRendererAccessibilityTree
Review URL: http://codereview.chromium.org/3244011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accessibility')
-rw-r--r-- | views/accessibility/view_accessibility.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc index 5ed0c99..46f2e56 100644 --- a/views/accessibility/view_accessibility.cc +++ b/views/accessibility/view_accessibility.cc @@ -290,11 +290,6 @@ STDMETHODIMP ViewAccessibility::get_accChild(VARIANT var_child, // Check to see if child is out-of-bounds. if (IsValidChild((var_child.lVal - 1), view_)) { child_view = view_->GetChildViewAt(var_child.lVal - 1); - - // Parents handle leaf IAccessible's. - if (child_view && child_view->GetChildViewCount() == 0 && - !child_view->child_widget()) - return S_FALSE; } else { // Child is located elsewhere in this view's subtree. // Positive child id's are 1-based indexes so you can iterate over all @@ -335,6 +330,10 @@ STDMETHODIMP ViewAccessibility::get_accChild(VARIANT var_child, } } + // Parents handle leaf IAccessible's. + if (child_view->GetChildViewCount() == 0) + return S_FALSE; + // Finally, try our ViewAccessibility implementation. // Retrieve the IUnknown interface for the requested child view, and // assign the IDispatch returned. |