Commit cd1f4d36 authored by DongJun Kim's avatar DongJun Kim Committed by Commit Bot

fixup! Introduce SupportsARIAExpanded() for aria-expanded

Chrome/VoiceOver didn't narrates `aria-expanded` state in latest code.
We fix from AriaRoleAttribute() to RoleValue() in SupportsARIAExpanded.

Bug: 824465
Change-Id: Ib9ded5bbf84ad59f96cd2eb06cdd18eb537d8224
Reviewed-on: https://chromium-review.googlesource.com/989633
Commit-Queue: Nektarios Paisios <nektar@chromium.org>
Reviewed-by: default avatarNektarios Paisios <nektar@chromium.org>
Reviewed-by: default avatarAaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548140}
parent f8b28baa
...@@ -18,7 +18,7 @@ rootWebArea name='Action verbs' ...@@ -18,7 +18,7 @@ rootWebArea name='Action verbs'
++radioButton defaultActionVerb=check checkedState=false ++radioButton defaultActionVerb=check checkedState=false
++switch name='ARIA Switch' defaultActionVerb=check checkedState=false ++switch name='ARIA Switch' defaultActionVerb=check checkedState=false
++details ++details
++++disclosureTriangle name='Summary' defaultActionVerb=press ++++disclosureTriangle collapsed name='Summary' defaultActionVerb=press
++++++staticText name='Summary' ++++++staticText name='Summary'
++++++++inlineTextBox name='Summary' ++++++++inlineTextBox name='Summary'
++popUpButton collapsed haspopup defaultActionVerb=open ++popUpButton collapsed haspopup defaultActionVerb=open
......
...@@ -15,7 +15,7 @@ ROLE_SYSTEM_DOCUMENT name='Action verbs' READONLY FOCUSABLE ...@@ -15,7 +15,7 @@ ROLE_SYSTEM_DOCUMENT name='Action verbs' READONLY FOCUSABLE
++ROLE_SYSTEM_RADIOBUTTON FOCUSABLE IA2_STATE_CHECKABLE checkable:true default_action='check' action_name='check' ++ROLE_SYSTEM_RADIOBUTTON FOCUSABLE IA2_STATE_CHECKABLE checkable:true default_action='check' action_name='check'
++IA2_ROLE_TOGGLE_BUTTON name='ARIA Switch' FOCUSABLE IA2_STATE_CHECKABLE checkable:true default_action='check' action_name='check' ++IA2_ROLE_TOGGLE_BUTTON name='ARIA Switch' FOCUSABLE IA2_STATE_CHECKABLE checkable:true default_action='check' action_name='check'
++ROLE_SYSTEM_GROUPING ++ROLE_SYSTEM_GROUPING
++++ROLE_SYSTEM_PUSHBUTTON name='Summary' FOCUSABLE default_action='press' action_name='press' ++++ROLE_SYSTEM_PUSHBUTTON name='Summary' COLLAPSED FOCUSABLE default_action='press' action_name='press'
++++++ROLE_SYSTEM_STATICTEXT name='Summary' ++++++ROLE_SYSTEM_STATICTEXT name='Summary'
++ROLE_SYSTEM_COMBOBOX COLLAPSED FOCUSABLE HASPOPUP default_action='open' action_name='open' ++ROLE_SYSTEM_COMBOBOX COLLAPSED FOCUSABLE HASPOPUP default_action='open' action_name='open'
++++ROLE_SYSTEM_LIST INVISIBLE ++++ROLE_SYSTEM_LIST INVISIBLE
......
rootWebArea rootWebArea
++details ++details
++++disclosureTriangle name='details tag' ++++disclosureTriangle collapsed name='details tag'
++++++staticText name='details tag' ++++++staticText name='details tag'
++++++++inlineTextBox name='details tag' ++++++++inlineTextBox name='details tag'
++details ++details
......
AXWebArea AXRoleDescription='HTML content' AXWebArea AXRoleDescription='HTML content'
++AXGroup AXRoleDescription='group' ++AXGroup AXRoleDescription='group'
++++AXButton AXRoleDescription='disclosure triangle' AXTitle='details tag' ++++AXButton AXRoleDescription='disclosure triangle' AXTitle='details tag' AXExpanded='0'
++++++AXStaticText AXRoleDescription='text' AXValue='details tag' ++++++AXStaticText AXRoleDescription='text' AXValue='details tag'
++AXGroup AXRoleDescription='group' ++AXGroup AXRoleDescription='group'
++++AXButton AXRoleDescription='disclosure triangle' AXTitle='details tag open' ++++AXButton AXRoleDescription='disclosure triangle' AXTitle='details tag open' AXExpanded='1'
++++++AXStaticText AXRoleDescription='text' AXValue='details tag open' ++++++AXStaticText AXRoleDescription='text' AXValue='details tag open'
++++AXGroup AXRoleDescription='group' ++++AXGroup AXRoleDescription='group'
++++++AXStaticText AXRoleDescription='text' AXValue='The details tag with open specifies that the details should be visible (open) to the user.' ++++++AXStaticText AXRoleDescription='text' AXValue='The details tag with open specifies that the details should be visible (open) to the user.'
ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
++ROLE_SYSTEM_GROUPING ++ROLE_SYSTEM_GROUPING
++++ROLE_SYSTEM_PUSHBUTTON name='details tag' FOCUSABLE ++++ROLE_SYSTEM_PUSHBUTTON name='details tag' COLLAPSED FOCUSABLE
++++++ROLE_SYSTEM_STATICTEXT name='details tag' ++++++ROLE_SYSTEM_STATICTEXT name='details tag'
++ROLE_SYSTEM_GROUPING ++ROLE_SYSTEM_GROUPING
++++ROLE_SYSTEM_PUSHBUTTON name='details tag open' FOCUSABLE ++++ROLE_SYSTEM_PUSHBUTTON name='details tag open' EXPANDED FOCUSABLE
++++++ROLE_SYSTEM_STATICTEXT name='details tag open' ++++++ROLE_SYSTEM_STATICTEXT name='details tag open'
++++IA2_ROLE_PARAGRAPH ++++IA2_ROLE_PARAGRAPH
++++++ROLE_SYSTEM_STATICTEXT name='The details tag with open specifies that the details should be visible (open) to the user.' ++++++ROLE_SYSTEM_STATICTEXT name='The details tag with open specifies that the details should be visible (open) to the user.'
rootWebArea rootWebArea
++details ++details
++++disclosureTriangle name='details tag' ++++disclosureTriangle collapsed name='details tag'
++++++staticText name='details tag' ++++++staticText name='details tag'
++++++++inlineTextBox name='details tag' ++++++++inlineTextBox name='details tag'
\ No newline at end of file
ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
++ROLE_SYSTEM_GROUPING ++ROLE_SYSTEM_GROUPING
++++ROLE_SYSTEM_PUSHBUTTON name='details tag' FOCUSABLE ++++ROLE_SYSTEM_PUSHBUTTON name='details tag' COLLAPSED FOCUSABLE
++++++ROLE_SYSTEM_STATICTEXT name='details tag' ++++++ROLE_SYSTEM_STATICTEXT name='details tag'
\ No newline at end of file
...@@ -31,7 +31,15 @@ Tests name sources in details and summary. ...@@ -31,7 +31,15 @@ Tests name sources in details and summary.
} }
] ]
}, },
"properties": [], "properties": [
{
"name": "expanded",
"value": {
"type": "booleanOrUndefined",
"value": false
}
}
],
"domNode": "summary#summary2" "domNode": "summary#summary2"
} }
{ {
...@@ -75,7 +83,15 @@ Tests name sources in details and summary. ...@@ -75,7 +83,15 @@ Tests name sources in details and summary.
"type": "computedString", "type": "computedString",
"value": "summary3-title" "value": "summary3-title"
}, },
"properties": [], "properties": [
{
"name": "expanded",
"value": {
"type": "booleanOrUndefined",
"value": false
}
}
],
"domNode": "summary#summary3" "domNode": "summary#summary3"
} }
{ {
...@@ -128,7 +144,15 @@ Tests name sources in details and summary. ...@@ -128,7 +144,15 @@ Tests name sources in details and summary.
"type": "computedString", "type": "computedString",
"value": "summary4-contents" "value": "summary4-contents"
}, },
"properties": [], "properties": [
{
"name": "expanded",
"value": {
"type": "booleanOrUndefined",
"value": false
}
}
],
"domNode": "summary#summary4" "domNode": "summary#summary4"
} }
{ {
...@@ -198,6 +222,13 @@ Tests name sources in details and summary. ...@@ -198,6 +222,13 @@ Tests name sources in details and summary.
"value": "summary5-contents" "value": "summary5-contents"
}, },
"properties": [ "properties": [
{
"name": "expanded",
"value": {
"type": "booleanOrUndefined",
"value": false
}
},
{ {
"name": "labelledby", "name": "labelledby",
"value": { "value": {
......
...@@ -1550,7 +1550,7 @@ bool AXObject::SupportsARIAActiveDescendant() const { ...@@ -1550,7 +1550,7 @@ bool AXObject::SupportsARIAActiveDescendant() const {
} }
bool AXObject::SupportsARIAExpanded() const { bool AXObject::SupportsARIAExpanded() const {
switch (AriaRoleAttribute()) { switch (RoleValue()) {
case kAlertDialogRole: case kAlertDialogRole:
case kAlertRole: case kAlertRole:
case kArticleRole: case kArticleRole:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment