content/browser/accessibility/browser_accessibility_win.cc - Issue 1705853002: NOT FOR REVIEW. ax tree focus with debugging

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/accessibility/browser_accessibility_win.cc

Issue 1705853002: NOT FOR REVIEW. ax tree focus with debugging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed crash Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/accessibility/browser_accessibility_manager_win.cc ('k') | content/browser/accessibility/browser_accessibility_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/accessibility/browser_accessibility_win.cc

diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc

index 0bfe2351030d05dcf889ad243eec54c2dca370b9..a78d8b2f0aac81fe59c296b4b17cc0184eee8388 100644

--- a/content/browser/accessibility/browser_accessibility_win.cc

+++ b/content/browser/accessibility/browser_accessibility_win.cc

@@ -435,7 +435,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accFocus(VARIANT* focus_child) {

return E_INVALIDARG;

BrowserAccessibilityWin* focus = static_cast<BrowserAccessibilityWin*>(

- manager()->GetFocus(this));

+ manager()->GetFocus());

if (focus == this) {

focus_child->vt = VT_I4;

focus_child->lVal = CHILDID_SELF;

@@ -570,7 +570,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_accState(VARIANT var_id,

state->vt = VT_I4;

state->lVal = target->ia_state();

- if (manager()->GetFocus(NULL) == this)

+ if (manager()->GetFocus() == this)

state->lVal |= STATE_SYSTEM_FOCUSED;

return S_OK;

@@ -677,7 +677,7 @@ STDMETHODIMP BrowserAccessibilityWin::accSelect(

return E_FAIL;

if (flags_sel & SELFLAG_TAKEFOCUS) {

- manager()->SetFocus(this, true);

+ manager()->SetFocus(*this);

return S_OK;

}

@@ -4435,8 +4435,6 @@ void BrowserAccessibilityWin::InitRoleAndState() {

ia_role = ROLE_SYSTEM_LISTITEM;

if (ia_state & STATE_SYSTEM_SELECTABLE) {

ia_state |= STATE_SYSTEM_FOCUSABLE;

- if (HasState(ui::AX_STATE_FOCUSED))

- ia_state |= STATE_SYSTEM_FOCUSED;

}

break;

case ui::AX_ROLE_LIST_ITEM:

@@ -4485,8 +4483,6 @@ void BrowserAccessibilityWin::InitRoleAndState() {

ia2_state &= ~(IA2_STATE_EDITABLE);

if (ia_state & STATE_SYSTEM_SELECTABLE) {

ia_state |= STATE_SYSTEM_FOCUSABLE;

- if (HasState(ui::AX_STATE_FOCUSED))

- ia_state |= STATE_SYSTEM_FOCUSED;

}

break;

case ui::AX_ROLE_METER: