content/browser/accessibility/browser_accessibility_win.cc - Issue 1046883002: Use multiline attribute to check for IA2_STATE_MULTILINE.

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 1046883002: Use multiline attribute to check for IA2_STATE_MULTILINE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/accessibility/browser_accessibility_cocoa.mm ('k') | content/renderer/accessibility/blink_ax_enum_conversion.cc » ('j') | ui/accessibility/ax_enums.idl » ('J')
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 5c318b29e1c7de1041fc3a12a90404645cc80052..56d17482b8ad81485c12360714b5c42f1d6ae942 100644

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

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

@@ -1943,8 +1943,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) {

return E_INVALIDARG;

*offset = 0;

- if (GetRole() == ui::AX_ROLE_TEXT_FIELD ||

- GetRole() == ui::AX_ROLE_TEXT_AREA) {

+ if (GetRole() == ui::AX_ROLE_TEXT_FIELD) {

int sel_start = 0;

if (GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START,

&sel_start))

@@ -1999,8 +1998,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_nSelections(LONG* n_selections) {

return E_INVALIDARG;

*n_selections = 0;

- if (GetRole() == ui::AX_ROLE_TEXT_FIELD ||

- GetRole() == ui::AX_ROLE_TEXT_AREA) {

+ if (GetRole() == ui::AX_ROLE_TEXT_FIELD) {

int sel_start = 0;

int sel_end = 0;

if (GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START,

@@ -2024,8 +2022,7 @@ STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index,

*start_offset = 0;

*end_offset = 0;

- if (GetRole() == ui::AX_ROLE_TEXT_FIELD ||

- GetRole() == ui::AX_ROLE_TEXT_AREA) {

+ if (GetRole() == ui::AX_ROLE_TEXT_FIELD) {

int sel_start = 0;

int sel_end = 0;

if (GetIntAttribute(

@@ -4057,16 +4054,13 @@ void BrowserAccessibilityWin::InitRoleAndState() {

ia_role = ROLE_SYSTEM_PUSHBUTTON;

ia2_role = IA2_ROLE_TOGGLE_BUTTON;

break;

- case ui::AX_ROLE_TEXT_AREA:

- ia_role = ROLE_SYSTEM_TEXT;

- ia2_state |= IA2_STATE_MULTI_LINE;

- ia2_state |= IA2_STATE_EDITABLE;

- ia2_state |= IA2_STATE_SELECTABLE_TEXT;

- break;

case ui::AX_ROLE_TEXT_FIELD:

case ui::AX_ROLE_SEARCH_BOX:

ia_role = ROLE_SYSTEM_TEXT;

- ia2_state |= IA2_STATE_SINGLE_LINE;

+ if (HasState(ui::AX_STATE_MULTILINE))

+ ia2_state |= IA2_STATE_MULTI_LINE

+ else

+ ia2_state |= IA2_STATE_SINGLE_LINE

ia2_state |= IA2_STATE_EDITABLE;

ia2_state |= IA2_STATE_SELECTABLE_TEXT;

break;