| Index: third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
|
| diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
|
| index 3b33943fe56ecf63894974dceb437db5bf7e95ac..540a753bcd7032bc4c12c58d8629bbf855f2d025 100644
|
| --- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
|
| +++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
|
| @@ -163,7 +163,7 @@ bool AXNodeObject::computeAccessibilityIsIgnored(
|
| return true;
|
| }
|
|
|
| - if (m_role == UnknownRole) {
|
| + if (roleValue() == UnknownRole) {
|
| if (ignoredReasons)
|
| ignoredReasons->append(IgnoredReason(AXUninteresting));
|
| return true;
|
| @@ -513,6 +513,18 @@ AccessibilityRole AXNodeObject::nativeAccessibilityRoleIgnoringAria() const {
|
| return UnknownRole;
|
| }
|
|
|
| +AccessibilityRole AXNodeObject::roleValue() const {
|
| + if (m_role != NeedsToDetermineRole)
|
| + return m_role;
|
| + AXNodeObject* node = const_cast<AXNodeObject*>(this);
|
| + node->m_role = node->determineAccessibilityRole();
|
| + return m_role;
|
| +}
|
| +
|
| +void AXNodeObject::setNeedsDetermineAccessibilityRole() {
|
| + m_role = NeedsToDetermineRole;
|
| +}
|
| +
|
| AccessibilityRole AXNodeObject::determineAccessibilityRole() {
|
| if (!getNode())
|
| return UnknownRole;
|
| @@ -743,7 +755,7 @@ void AXNodeObject::init() {
|
| ASSERT(!m_initialized);
|
| m_initialized = true;
|
| #endif
|
| - m_role = determineAccessibilityRole();
|
| + setNeedsDetermineAccessibilityRole();
|
| }
|
|
|
| void AXNodeObject::detach() {
|
| @@ -2192,7 +2204,7 @@ void AXNodeObject::textChanged() {
|
|
|
| void AXNodeObject::updateAccessibilityRole() {
|
| bool ignoredStatus = accessibilityIsIgnored();
|
| - m_role = determineAccessibilityRole();
|
| + setNeedsDetermineAccessibilityRole();
|
|
|
| // The AX hierarchy only needs to be updated if the ignored status of an
|
| // element has changed.
|
|
|