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 7ce45cecb67b3cb30342bd9cf0d999a92c01b452..72022d3cb7344bb72213fb8f7ea5a0c0f726569d 100644 |
--- a/content/browser/accessibility/browser_accessibility_win.cc |
+++ b/content/browser/accessibility/browser_accessibility_win.cc |
@@ -3441,11 +3441,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
break; |
case ui::AX_ROLE_COLUMN: |
ia_role_ = ROLE_SYSTEM_COLUMN; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_COLUMN_HEADER: |
ia_role_ = ROLE_SYSTEM_COLUMNHEADER; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_COMBO_BOX: |
ia_role_ = ROLE_SYSTEM_COMBOBOX; |
@@ -3540,6 +3538,7 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
ia_role_ = ROLE_SYSTEM_GROUPING; |
} else if (html_tag == L"li") { |
ia_role_ = ROLE_SYSTEM_LISTITEM; |
+ ia_state_ |= STATE_SYSTEM_READONLY; |
} else { |
if (html_tag.empty()) |
role_name_ = L"div"; |
@@ -3547,7 +3546,6 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
role_name_ = html_tag; |
ia2_role_ = IA2_ROLE_SECTION; |
} |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
} |
case ui::AX_ROLE_GROW_AREA: |
@@ -3557,14 +3555,14 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
case ui::AX_ROLE_HEADING: |
role_name_ = html_tag; |
ia2_role_ = IA2_ROLE_HEADING; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_HORIZONTAL_RULE: |
ia_role_ = ROLE_SYSTEM_SEPARATOR; |
break; |
case ui::AX_ROLE_IFRAME: |
- ia_role_ = ROLE_SYSTEM_CLIENT; |
+ ia_role_ = ROLE_SYSTEM_DOCUMENT; |
ia2_role_ = IA2_ROLE_INTERNAL_FRAME; |
+ ia_state_ = STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_IMAGE: |
ia_role_ = ROLE_SYSTEM_GRAPHIC; |
@@ -3668,7 +3666,6 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
break; |
case ui::AX_ROLE_OUTLINE: |
ia_role_ = ROLE_SYSTEM_OUTLINE; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_PARAGRAPH: |
role_name_ = L"P"; |
@@ -3706,11 +3703,9 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
break; |
case ui::AX_ROLE_ROW: |
ia_role_ = ROLE_SYSTEM_ROW; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_ROW_HEADER: |
ia_role_ = ROLE_SYSTEM_ROWHEADER; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_RULER: |
ia_role_ = ROLE_SYSTEM_CLIENT; |
@@ -3765,7 +3760,6 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
ia_role_ = ROLE_SYSTEM_OUTLINE; |
} else { |
ia_role_ = ROLE_SYSTEM_TABLE; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
} |
break; |
} |
@@ -3813,15 +3807,12 @@ void BrowserAccessibilityWin::InitRoleAndState() { |
break; |
case ui::AX_ROLE_TREE: |
ia_role_ = ROLE_SYSTEM_OUTLINE; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_TREE_GRID: |
ia_role_ = ROLE_SYSTEM_OUTLINE; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_TREE_ITEM: |
ia_role_ = ROLE_SYSTEM_OUTLINEITEM; |
- ia_state_ |= STATE_SYSTEM_READONLY; |
break; |
case ui::AX_ROLE_WINDOW: |
ia_role_ = ROLE_SYSTEM_WINDOW; |