Revert of Initial skeleton of Accessibility Object Model Phase 1

third_party/WebKit/Source/modules/accessibility/AXObject.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 12 matching lines @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/accessibility/AXObject.h"
 
 #include "SkMatrix44.h"
 #include "core/css/resolver/StyleResolver.h"
-#include "core/dom/AccessibleNode.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLDialogElement.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutBoxModelObject.h"
@@ skipping 328 matching lines @@
   // no children are left with dangling pointers to their parent.
   clearChildren();
 
   m_axObjectCache = nullptr;
 }
 
 bool AXObject::isDetached() const {
   return !m_axObjectCache;
 }
 
-const AtomicString& AXObject::getAOMPropertyOrARIAAttribute(
-    AOMStringProperty property) const {
-  Node* node = this->getNode();
-  if (!node || !node->isElementNode())
-    return nullAtom;
-
-  return AccessibleNode::getProperty(toElement(node), property);
-}
-
 bool AXObject::isARIATextControl() const {
   return ariaRoleAttribute() == TextFieldRole ||
          ariaRoleAttribute() == SearchBoxRole ||
          ariaRoleAttribute() == ComboBoxRole;
 }
 
 bool AXObject::isButton() const {
   AccessibilityRole role = roleValue();
 
   return role == ButtonRole || role == PopUpButtonRole ||
@@ skipping 405 matching lines @@
     }
   }
 
   // Step 2C from: http://www.w3.org/TR/accname-aam-1.1
   // If you change this logic, update AXNodeObject::nameFromLabelElement, too.
   nameFrom = AXNameFromAttribute;
   if (nameSources) {
     nameSources->push_back(NameSource(*foundTextAlternative, aria_labelAttr));
     nameSources->back().type = nameFrom;
   }
-  const AtomicString& ariaLabel =
-      getAOMPropertyOrARIAAttribute(AOMStringProperty::kLabel);
+  const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
   if (!ariaLabel.isEmpty()) {
     textAlternative = ariaLabel;
 
     if (nameSources) {
       NameSource& source = nameSources->back();
       source.text = textAlternative;
       source.attributeValue = ariaLabel;
       *foundTextAlternative = true;
     } else {
       *foundTextAlternative = true;
@@ skipping 956 matching lines @@
 }
 
 DEFINE_TRACE(AXObject) {
   visitor->trace(m_children);
   visitor->trace(m_parent);
   visitor->trace(m_cachedLiveRegionRoot);
   visitor->trace(m_axObjectCache);
 }
 
 }  // namespace blink