Moving Attribute Getters from AXObject to AXNodeObject.

On an AXObject these would always return their default value, as they
need a Node to get an Element to get the attribute.

AX-Relnotes: n/a.
Change-Id: Icb4a430a695e58fe70c7d7be1f6fc896ca38dc90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2520479Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Alice Boxhall <aboxhall@chromium.org>
Commit-Queue: Chris Hall <chrishall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824710}

third_party/blink/renderer/modules/accessibility/ax_node_object.cc

@@ -3668,6 +3668,41 @@ AtomicString AXNodeObject::Language() const {
   return AtomicString(languages[0].StripWhiteSpace());
 }
 
+bool AXNodeObject::HasAttribute(const QualifiedName& attribute) const {
+  Element* element = GetElement();
+  if (!element)
+    return false;
+  if (element->FastHasAttribute(attribute))
+    return true;
+  return HasInternalsAttribute(*element, attribute);
+}
+
+const AtomicString& AXNodeObject::GetAttribute(
+    const QualifiedName& attribute) const {
+  Element* element = GetElement();
+  if (!element)
+    return g_null_atom;
+  const AtomicString& value = element->FastGetAttribute(attribute);
+  if (!value.IsNull())
+    return value;
+  return GetInternalsAttribute(*element, attribute);
+}
+
+bool AXNodeObject::HasInternalsAttribute(Element& element,
+                                         const QualifiedName& attribute) const {
+  if (!element.DidAttachInternals())
+    return false;
+  return element.EnsureElementInternals().HasAttribute(attribute);
+}
+
+const AtomicString& AXNodeObject::GetInternalsAttribute(
+    Element& element,
+    const QualifiedName& attribute) const {
+  if (!element.DidAttachInternals())
+    return g_null_atom;
+  return element.EnsureElementInternals().FastGetAttribute(attribute);
+}
+
 void AXNodeObject::SetNode(Node* node) {
   node_ = node;
 }

third_party/blink/renderer/modules/accessibility/ax_node_object.h

@@ -245,6 +245,8 @@ class MODULES_EXPORT AXNodeObject : public AXObject {
 
   // DOM and layout tree access.
   AtomicString Language() const override;
+  bool HasAttribute(const QualifiedName&) const override;
+  const AtomicString& GetAttribute(const QualifiedName&) const override;
 
   // Modify or take an action on an object.
   bool OnNativeFocusAction() final;
@@ -294,6 +296,10 @@ class MODULES_EXPORT AXNodeObject : public AXObject {
   FRIEND_TEST_ALL_PREFIXES(AccessibilityTest, UpdateChildrenIfNecessary);
 
  private:
+  bool HasInternalsAttribute(Element&, const QualifiedName&) const;
+  const AtomicString& GetInternalsAttribute(Element&,
+                                            const QualifiedName&) const;
+
   Member<Node> node_;
 
   bool IsNativeCheckboxInMixedState() const;

third_party/blink/renderer/modules/accessibility/ax_object.cc

@@ -3478,41 +3478,6 @@ AtomicString AXObject::Language() const {
   return default_language;
 }
 
-bool AXObject::HasAttribute(const QualifiedName& attribute) const {
-  Element* element = GetElement();
-  if (!element)
-    return false;
-  if (element->FastHasAttribute(attribute))
-    return true;
-  return HasInternalsAttribute(*element, attribute);
-}
-
-const AtomicString& AXObject::GetAttribute(
-    const QualifiedName& attribute) const {
-  Element* element = GetElement();
-  if (!element)
-    return g_null_atom;
-  const AtomicString& value = element->FastGetAttribute(attribute);
-  if (!value.IsNull())
-    return value;
-  return GetInternalsAttribute(*element, attribute);
-}
-
-bool AXObject::HasInternalsAttribute(Element& element,
-                                     const QualifiedName& attribute) const {
-  if (!element.DidAttachInternals())
-    return false;
-  return element.EnsureElementInternals().HasAttribute(attribute);
-}
-
-const AtomicString& AXObject::GetInternalsAttribute(
-    Element& element,
-    const QualifiedName& attribute) const {
-  if (!element.DidAttachInternals())
-    return g_null_atom;
-  return element.EnsureElementInternals().FastGetAttribute(attribute);
-}
-
 //
 // Scrollable containers.
 //

third_party/blink/renderer/modules/accessibility/ax_object.h

@@ -1113,8 +1113,10 @@ class MODULES_EXPORT AXObject : public GarbageCollected<AXObject> {
   virtual Element* AnchorElement() const { return nullptr; }
   virtual Element* ActionElement() const { return nullptr; }
   virtual AtomicString Language() const;
-  bool HasAttribute(const QualifiedName&) const;
-  const AtomicString& GetAttribute(const QualifiedName&) const;
+  virtual bool HasAttribute(const QualifiedName&) const { return false; }
+  virtual const AtomicString& GetAttribute(const QualifiedName&) const {
+    return g_null_atom;
+  }
 
   // Scrollable containers.
   bool IsScrollableContainer() const;
@@ -1353,9 +1355,6 @@ class MODULES_EXPORT AXObject : public GarbageCollected<AXObject> {
   ax::mojom::blink::Role RemapAriaRoleDueToParent(ax::mojom::blink::Role) const;
   unsigned ComputeAriaColumnIndex() const;
   unsigned ComputeAriaRowIndex() const;
-  bool HasInternalsAttribute(Element&, const QualifiedName&) const;
-  const AtomicString& GetInternalsAttribute(Element&,
-                                            const QualifiedName&) const;
   bool ComputeIsHiddenViaStyle() const;
 
   // This returns true if the element associated with this AXObject is has