Revert of Initial skeleton of Accessibility Object Model Phase 1

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

 /*
  * Copyright (C) 2012, Google 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 11 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * 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/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"
 #include "core/dom/QualifiedName.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/FlatTreeTraversal.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLAnchorElement.h"
@@ skipping 569 matching lines @@
 
   if (isHTMLDialogElement(*getNode()))
     return DialogRole;
 
   // The HTML element should not be exposed as an element. That's what the
   // LayoutView element does.
   if (isHTMLHtmlElement(*getNode()))
     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;
   }
 
   // There should only be one banner/contentInfo per page. If header/footer are
   // being used within an article or section then it should not be exposed as
   // whole page's banner/contentInfo but as a group role.
   if (getNode()->hasTagName(headerTag)) {
     if (isDescendantOfElementType(getLandmarkRolesNotAllowed()))
@@ skipping 52 matching lines @@
     // A generic element with tabIndex explicitly set gets GroupRole.
     // The layout checks for focusability aren't critical here; a false
     // positive would be harmless.
     if (element->isInCanvasSubtree() && element->supportsFocus())
       return GroupRole;
   }
   return UnknownRole;
 }
 
 AccessibilityRole AXNodeObject::determineAriaRoleAttribute() const {
-  const AtomicString& ariaRole =
-      getAOMPropertyOrARIAAttribute(AOMStringProperty::kRole);
+  const AtomicString& ariaRole = getAttribute(roleAttr);
   if (ariaRole.isNull() || ariaRole.isEmpty())
     return UnknownRole;
 
   AccessibilityRole role = ariaRoleToWebCoreRole(ariaRole);
 
   // ARIA states if an item can get focus, it should not be presentational.
   if ((role == NoneRole || role == PresentationalRole) &&
       canSetFocusAttribute())
     return UnknownRole;
 
@@ skipping 1279 matching lines @@
   if (isHiddenForTextAlternativeCalculation())
     return false;
 
   // Step 2B from: http://www.w3.org/TR/accname-aam-1.1
   HeapVector<Member<Element>> elements;
   ariaLabelledbyElementVector(elements);
   if (elements.size() > 0)
     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;
 
   // Based on
   // http://rawgit.com/w3c/aria/master/html-aam/html-aam.html#accessible-name-and-description-calculation
   // 5.1/5.5 Text inputs, Other labelable Elements
   HTMLElement* htmlElement = nullptr;
   if (getNode()->isHTMLElement())
     htmlElement = toHTMLElement(getNode());
   if (htmlElement && isLabelableElement(htmlElement)) {
@@ skipping 913 matching lines @@
   if (isWebArea()) {
     Document* document = this->getDocument();
     if (document) {
       nameFrom = AXNameFromAttribute;
       if (nameSources) {
         nameSources->push_back(
             NameSource(foundTextAlternative, aria_labelAttr));
         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;
 
           if (nameSources) {
             NameSource& source = nameSources->back();
             source.text = textAlternative;
             source.attributeValue = ariaLabel;
             *foundTextAlternative = true;
           } else {
             return textAlternative;
@@ skipping 266 matching lines @@
     return String();
   return toTextControlElement(node)->strippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->trace(m_node);
   AXObject::trace(visitor);
 }
 
 }  // namespace blink