Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: content/browser/accessibility/browser_accessibility_win.cc

Issue 1811403002: IAccessible::get_accChild should only return a descendant. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/accessibility/browser_accessibility_win_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/accessibility/browser_accessibility_win.h" 5 #include "content/browser/accessibility/browser_accessibility_win.h"
6 6
7 #include <UIAutomationClient.h> 7 #include <UIAutomationClient.h>
8 #include <UIAutomationCoreApi.h> 8 #include <UIAutomationCoreApi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 3563 matching lines...) Expand 10 before | Expand all | Expand 10 after
3574 } 3574 }
3575 3575
3576 BrowserAccessibilityWin* BrowserAccessibilityWin::NewReference() { 3576 BrowserAccessibilityWin* BrowserAccessibilityWin::NewReference() {
3577 AddRef(); 3577 AddRef();
3578 return this; 3578 return this;
3579 } 3579 }
3580 3580
3581 BrowserAccessibilityWin* BrowserAccessibilityWin::GetTargetFromChildID( 3581 BrowserAccessibilityWin* BrowserAccessibilityWin::GetTargetFromChildID(
3582 const VARIANT& var_id) { 3582 const VARIANT& var_id) {
3583 if (var_id.vt != VT_I4) 3583 if (var_id.vt != VT_I4)
3584 return NULL; 3584 return nullptr;
3585 3585
3586 LONG child_id = var_id.lVal; 3586 LONG child_id = var_id.lVal;
3587 if (child_id == CHILDID_SELF) 3587 if (child_id == CHILDID_SELF)
3588 return this; 3588 return this;
3589 3589
3590 if (child_id >= 1 && child_id <= static_cast<LONG>(PlatformChildCount())) 3590 if (child_id >= 1 && child_id <= static_cast<LONG>(PlatformChildCount()))
3591 return ToBrowserAccessibilityWin(PlatformGetChild(child_id - 1)); 3591 return ToBrowserAccessibilityWin(PlatformGetChild(child_id - 1));
3592 3592
3593 return ToBrowserAccessibilityWin( 3593 BrowserAccessibilityWin* child = ToBrowserAccessibilityWin(
3594 BrowserAccessibility::GetFromUniqueID(-child_id)); 3594 BrowserAccessibility::GetFromUniqueID(-child_id));
3595 if (child && child->IsDescendantOf(this))
3596 return child;
3597
3598 return nullptr;
3595 } 3599 }
3596 3600
3597 HRESULT BrowserAccessibilityWin::GetStringAttributeAsBstr( 3601 HRESULT BrowserAccessibilityWin::GetStringAttributeAsBstr(
3598 ui::AXStringAttribute attribute, 3602 ui::AXStringAttribute attribute,
3599 BSTR* value_bstr) { 3603 BSTR* value_bstr) {
3600 base::string16 str; 3604 base::string16 str;
3601 3605
3602 if (!GetString16Attribute(attribute, &str)) 3606 if (!GetString16Attribute(attribute, &str))
3603 return S_FALSE; 3607 return S_FALSE;
3604 3608
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
4685 return static_cast<BrowserAccessibilityWin*>(obj); 4689 return static_cast<BrowserAccessibilityWin*>(obj);
4686 } 4690 }
4687 4691
4688 const BrowserAccessibilityWin* 4692 const BrowserAccessibilityWin*
4689 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) { 4693 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) {
4690 DCHECK(!obj || obj->IsNative()); 4694 DCHECK(!obj || obj->IsNative());
4691 return static_cast<const BrowserAccessibilityWin*>(obj); 4695 return static_cast<const BrowserAccessibilityWin*>(obj);
4692 } 4696 }
4693 4697
4694 } // namespace content 4698 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/accessibility/browser_accessibility_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698