Revert of Initial skeleton of Accessibility Object Model Phase 1

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

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 ef93a929b436fd4bec20042a24be1a06e346e6a5..e27a9b21a417919596fb3f24fb1126e28dc7d775 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
@@ -29,7 +29,6 @@
 #include "modules/accessibility/AXNodeObject.h"
 
 #include "core/InputTypeNames.h"
-#include "core/dom/AccessibleNode.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/Element.h"
 #include "core/dom/NodeTraversal.h"
@@ -619,8 +618,7 @@
     return IgnoredRole;
 
   if (isHTMLIFrameElement(*getNode())) {
-    const AtomicString& ariaRole =
-        getAOMPropertyOrARIAAttribute(AOMStringProperty::kRole);
+    const AtomicString& ariaRole = getAttribute(roleAttr);
     if (ariaRole == "none" || ariaRole == "presentation")
       return IframePresentationalRole;
     return IframeRole;
@@ -693,8 +691,7 @@
 }
 
 AccessibilityRole AXNodeObject::determineAriaRoleAttribute() const {
-  const AtomicString& ariaRole =
-      getAOMPropertyOrARIAAttribute(AOMStringProperty::kRole);
+  const AtomicString& ariaRole = getAttribute(roleAttr);
   if (ariaRole.isNull() || ariaRole.isEmpty())
     return UnknownRole;
 
@@ -1994,8 +1991,7 @@
     return false;
 
   // Step 2C from: http://www.w3.org/TR/accname-aam-1.1
-  const AtomicString& ariaLabel =
-      getAOMPropertyOrARIAAttribute(AOMStringProperty::kLabel);
+  const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
   if (!ariaLabel.isEmpty())
     return false;
 
@@ -2929,11 +2925,8 @@
         nameSources->back().type = nameFrom;
       }
       if (Element* documentElement = document->documentElement()) {
-        AXObject* axDocument = axObjectCache().getOrCreate(documentElement);
-        DCHECK(axDocument);
         const AtomicString& ariaLabel =
-            axDocument->getAOMPropertyOrARIAAttribute(
-                AOMStringProperty::kLabel);
+            documentElement->getAttribute(aria_labelAttr);
         if (!ariaLabel.isEmpty()) {
           textAlternative = ariaLabel;