Revert of "Implement the inert attribute"

third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 580 matching lines @@
     case kSpinButtonRole:
     case kTabRole:
     case kTextFieldRole:
     case kToggleButtonRole:
       return true;
     default:
       return false;
   }
 }
 
-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_;
 }
 
 void AXObjectImpl::UpdateCachedAttributeValuesIfNeeded() const {
   if (IsDetached())
     return;
 
   AXObjectCacheImpl& cache = AxObjectCache();
 
@@ skipping 61 matching lines @@
   if (GetNode()) {
     if (GetNode()->IsInert()) {
       if (ignored_reasons) {
         HTMLDialogElement* dialog = GetActiveDialogElement(GetNode());
         if (dialog) {
           AXObjectImpl* dialog_object = AxObjectCache().GetOrCreate(dialog);
           if (dialog_object) {
             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;
     }
   } else {
     AXObjectImpl* parent = ParentObject();
     if (parent && parent->IsInertOrAriaHidden()) {
       if (ignored_reasons)
         parent->ComputeIsInertOrAriaHidden(ignored_reasons);
       return true;
     }
   }
 
   const AXObjectImpl* hidden_root = AriaHiddenRoot();
   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;
   }
 
   return false;
 }
 
 bool AXObjectImpl::IsDescendantOfLeafNode() const {
   UpdateCachedAttributeValuesIfNeeded();
@@ skipping 14 matching lines @@
 const AXObjectImpl* AXObjectImpl::AriaHiddenRoot() const {
   for (const AXObjectImpl* object = this; object;
        object = object->ParentObject()) {
     if (object->AOMPropertyOrARIAAttributeIsTrue(AOMBooleanProperty::kHidden))
       return object;
   }
 
   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_;
 }
 
 const AXObjectImpl* AXObjectImpl::DisabledAncestor() const {
   bool disabled = false;
   if (HasAOMPropertyOrARIAAttribute(AOMBooleanProperty::kDisabled, disabled)) {
     if (disabled)
       return this;
@@ skipping 1305 matching lines @@
 }
 
 DEFINE_TRACE(AXObjectImpl) {
   visitor->Trace(children_);
   visitor->Trace(parent_);
   visitor->Trace(cached_live_region_root_);
   visitor->Trace(ax_object_cache_);
 }
 
 }  // namespace blink