Index: third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp |
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp |
index 27e1826487b0bb6a4f10df6ede73add0f79331a7..356be92faa256d5382dc70506d281f896d659a67 100644 |
--- a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp |
+++ b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp |
@@ -598,26 +598,7 @@ bool AXObjectImpl::IsClickable() const { |
} |
} |
-bool AXObjectImpl::AccessibilityIsIgnored() { |
- Node* node = GetNode(); |
- if (!node) { |
- AXObjectImpl* parent = this->ParentObject(); |
- while (!node && parent) { |
- node = parent->GetNode(); |
- parent = parent->ParentObject(); |
- } |
- } |
- |
- if (node) |
- node->UpdateDistribution(); |
- |
- // TODO(aboxhall): Instead of this, propagate inert down through frames |
- Document* document = GetDocument(); |
- while (document && document->LocalOwner()) { |
- document->LocalOwner()->UpdateDistribution(); |
- document = document->LocalOwner()->ownerDocument(); |
- } |
- |
+bool AXObjectImpl::AccessibilityIsIgnored() const { |
UpdateCachedAttributeValuesIfNeeded(); |
return cached_is_ignored_; |
} |
@@ -699,16 +680,11 @@ bool AXObjectImpl::ComputeIsInertOrAriaHidden( |
ignored_reasons->push_back( |
IgnoredReason(kAXActiveModalDialog, dialog_object)); |
} else { |
- ignored_reasons->push_back(IgnoredReason(kAXInertElement)); |
+ ignored_reasons->push_back(IgnoredReason(kAXInert)); |
} |
} else { |
- const AXObjectImpl* inert_root_el = InertRoot(); |
- if (inert_root_el == this) { |
- ignored_reasons->push_back(IgnoredReason(kAXInertElement)); |
- } else { |
- ignored_reasons->push_back( |
- IgnoredReason(kAXInertSubtree, inert_root_el)); |
- } |
+ // TODO(aboxhall): handle inert attribute if it eventuates |
+ ignored_reasons->push_back(IgnoredReason(kAXInert)); |
} |
} |
return true; |
@@ -726,10 +702,10 @@ bool AXObjectImpl::ComputeIsInertOrAriaHidden( |
if (hidden_root) { |
if (ignored_reasons) { |
if (hidden_root == this) { |
- ignored_reasons->push_back(IgnoredReason(kAXAriaHiddenElement)); |
+ ignored_reasons->push_back(IgnoredReason(kAXAriaHidden)); |
} else { |
ignored_reasons->push_back( |
- IgnoredReason(kAXAriaHiddenSubtree, hidden_root)); |
+ IgnoredReason(kAXAriaHiddenRoot, hidden_root)); |
} |
} |
return true; |
@@ -764,26 +740,6 @@ const AXObjectImpl* AXObjectImpl::AriaHiddenRoot() const { |
return 0; |
} |
-const AXObjectImpl* AXObjectImpl::InertRoot() const { |
- const AXObjectImpl* object = this; |
- if (!RuntimeEnabledFeatures::inertAttributeEnabled()) |
- return 0; |
- |
- while (object && !object->IsAXNodeObject()) |
- object = object->ParentObject(); |
- Node* node = object->GetNode(); |
- Element* element = node->IsElementNode() |
- ? ToElement(node) |
- : FlatTreeTraversal::ParentElement(*node); |
- while (element) { |
- if (element->hasAttribute(inertAttr)) |
- return AxObjectCache().GetOrCreate(element); |
- element = FlatTreeTraversal::ParentElement(*element); |
- } |
- |
- return 0; |
-} |
- |
bool AXObjectImpl::IsDescendantOfDisabledNode() const { |
UpdateCachedAttributeValuesIfNeeded(); |
return cached_is_descendant_of_disabled_node_; |