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 23 matching lines @@
 #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"
 #include "modules/accessibility/AXObjectCacheImpl.h"
+#include "modules/accessibility/AccessibleNode.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/text/PlatformLocale.h"
 #include "wtf/HashSet.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/WTFString.h"
 
 using blink::WebLocalizedString;
 
 namespace blink {
 
@@ skipping 287 matching lines @@
 
 unsigned AXObject::s_numberOfLiveAXObjects = 0;
 
 AXObject::AXObject(AXObjectCacheImpl& axObjectCache)
     : m_id(0),
       m_haveChildren(false),
       m_role(UnknownRole),
       m_lastKnownIsIgnoredValue(DefaultBehavior),
       m_explicitContainerID(0),
       m_parent(nullptr),
+      m_accessibleNode(nullptr),
       m_lastModificationCount(-1),
       m_cachedIsIgnored(false),
       m_cachedIsInertOrAriaHidden(false),
       m_cachedIsDescendantOfLeafNode(false),
       m_cachedIsDescendantOfDisabledNode(false),
       m_cachedHasInheritedPresentationalRole(false),
       m_cachedIsPresentationalChild(false),
       m_cachedAncestorExposesActiveDescendant(false),
       m_cachedLiveRegionRoot(nullptr),
       m_axObjectCache(&axObjectCache) {
@@ skipping 10 matching lines @@
   // no children are left with dangling pointers to their parent.
   clearChildren();
 
   m_axObjectCache = nullptr;
 }
 
 bool AXObject::isDetached() const {
   return !m_axObjectCache;
 }
 
+using AomStringPropertyToAriaMap = HashMap<AomStringProperty,
+                                           QualifiedName,
+                                           WTF::IntHash<AomStringProperty>,
+                                           AomStringPropertyHashTraits>;
+
+static AomStringPropertyToAriaMap& getAomStringPropertyToAriaMap() {
+  DEFINE_STATIC_LOCAL(AomStringPropertyToAriaMap, map, ());
+  if (map.isEmpty()) {
+    map.set(AomStringProperty::Role, roleAttr);
+    map.set(AomStringProperty::Label, aria_labelAttr);
+  }
+  return map;
+}
+
+const AtomicString& AXObject::getAomPropertyOrAriaAttribute(

[aboxhall, 2017/03/16 05:49:34]

maybe just getAuthorDefinedProperty?

[dmazzoni, 2017/03/16 20:43:14]

Hmmm, I wouldn't intuitively know how to interpret that.
I'm up for something more concise, but I think that at least
during the transition phase we should make this verbose enough
that anyone reading the code realizes we're checking two places
for an attribute/property.

Renamed to getAriaAttributeOrAomProperty for now to reflect
the correct precedence.

+    AomStringProperty property) const {
+  AccessibleNode* aomNode = getAccessibleNode();
+  if (aomNode) {

[aboxhall, 2017/03/16 05:49:34]

As discussed, swap this and the following block.

[dmazzoni, 2017/03/16 20:43:15]

Done.

+    const AtomicString& result = aomNode->getProperty(property);
+    if (!result.isNull())
+      return result;
+  }
+
+  AomStringPropertyToAriaMap& ariaMap = getAomStringPropertyToAriaMap();
+  QualifiedName attrName = ariaMap.at(property);
+  if (attrName != QualifiedName::null())
+    return getAttribute(attrName);
+
+  return nullAtom;
+}
+
 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 = getAttribute(aria_labelAttr);
+  const AtomicString& ariaLabel =
+      getAomPropertyOrAriaAttribute(AomStringProperty::Label);
   if (!ariaLabel.isEmpty()) {
     textAlternative = ariaLabel;
 
     if (nameSources) {
       NameSource& source = nameSources->back();
       source.text = textAlternative;
       source.attributeValue = ariaLabel;
       *foundTextAlternative = true;
     } else {
       *foundTextAlternative = true;
@@ skipping 942 matching lines @@
       createInternalRoleNameVector();
 
   return internalRoleNameVector->at(role);
 }
 
 DEFINE_TRACE(AXObject) {
   visitor->trace(m_children);
   visitor->trace(m_parent);
   visitor->trace(m_cachedLiveRegionRoot);
   visitor->trace(m_axObjectCache);
+  visitor->trace(m_accessibleNode);
 }
 
 }  // namespace blink