Index: content/shell/renderer/test_runner/web_ax_object_proxy.cc |
diff --git a/content/shell/renderer/test_runner/web_ax_object_proxy.cc b/content/shell/renderer/test_runner/web_ax_object_proxy.cc |
index e52343cd087a975126e1dda06765d08a9d4294b3..ca7264fd90dce9ffd3081572a59c15cfb59c11f2 100644 |
--- a/content/shell/renderer/test_runner/web_ax_object_proxy.cc |
+++ b/content/shell/renderer/test_runner/web_ax_object_proxy.cc |
@@ -756,7 +756,7 @@ bool WebAXObjectProxy::IsSelectedOptionActive() { |
bool WebAXObjectProxy::IsExpanded() { |
accessibility_object_.updateLayoutAndCheckValidity(); |
- return !accessibility_object_.isCollapsed(); |
+ return accessibility_object_.isExpanded() == blink::WebAXExpandedExpanded; |
} |
bool WebAXObjectProxy::IsChecked() { |
@@ -764,6 +764,11 @@ bool WebAXObjectProxy::IsChecked() { |
return accessibility_object_.isChecked(); |
} |
+bool WebAXObjectProxy::IsCollapsed() { |
+ accessibility_object_.updateLayoutAndCheckValidity(); |
+ return accessibility_object_.isExpanded() == blink::WebAXExpandedCollapsed; |
+} |
+ |
bool WebAXObjectProxy::IsVisible() { |
accessibility_object_.updateLayoutAndCheckValidity(); |
return accessibility_object_.isVisible(); |
@@ -774,11 +779,6 @@ bool WebAXObjectProxy::IsOffScreen() { |
return accessibility_object_.isOffScreen(); |
} |
-bool WebAXObjectProxy::IsCollapsed() { |
- accessibility_object_.updateLayoutAndCheckValidity(); |
- return accessibility_object_.isCollapsed(); |
-} |
- |
bool WebAXObjectProxy::HasPopup() { |
accessibility_object_.updateLayoutAndCheckValidity(); |
return accessibility_object_.ariaHasPopup(); |