Switch all LayoutTests to use new AX name calculation

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

 /*
  * Copyright (C) 2008 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 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 "config.h"
 #include "modules/accessibility/AXImageMapLink.h"
 
+#include "core/dom/ElementTraversal.h"
 #include "modules/accessibility/AXLayoutObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
-AXImageMapLink::AXImageMapLink(AXObjectCacheImpl& axObjectCache)
-    : AXMockObject(axObjectCache)
-    , m_areaElement(nullptr)
-    , m_mapElement(nullptr)
+AXImageMapLink::AXImageMapLink(HTMLAreaElement* area, AXObjectCacheImpl& axObjectCache)
+    : AXNodeObject(area, axObjectCache)
 {
 }
 
 AXImageMapLink::~AXImageMapLink()
 {
-    ASSERT(!m_areaElement);
-    ASSERT(!m_mapElement);
 }
 
-void AXImageMapLink::detach()
+AXImageMapLink* AXImageMapLink::create(HTMLAreaElement* area, AXObjectCacheImpl& axObjectCache)
 {
-    AXMockObject::detach();
-    m_areaElement = nullptr;
-    m_mapElement = nullptr;
+    return new AXImageMapLink(area, axObjectCache);
 }
 
-void AXImageMapLink::detachFromParent()
+HTMLMapElement* AXImageMapLink::mapElement() const
 {
-    AXMockObject::detachFromParent();
-    m_areaElement = nullptr;
-    m_mapElement = nullptr;
-}
-
-AXImageMapLink* AXImageMapLink::create(AXObjectCacheImpl& axObjectCache)
-{
-    return new AXImageMapLink(axObjectCache);
+    HTMLAreaElement* area = areaElement();
+    if (!area)
+        return nullptr;
+    return Traversal<HTMLMapElement>::firstAncestor(*area);
 }
 
 AXObject* AXImageMapLink::computeParent() const
 {
     if (m_parent)
         return m_parent;
 
-    if (!m_mapElement.get() || !m_mapElement->layoutObject())
-        return 0;
+    if (!mapElement())
+        return nullptr;
 
-    return axObjectCache().getOrCreate(m_mapElement->layoutObject());
+    return axObjectCache().getOrCreate(mapElement()->layoutObject());
 }
 
 AccessibilityRole AXImageMapLink::roleValue() const
 {
-    if (!m_areaElement)
-        return LinkRole;
-
     const AtomicString& ariaRole = getAttribute(roleAttr);
     if (!ariaRole.isEmpty())
         return AXObject::ariaRoleToWebCoreRole(ariaRole);
 
     return LinkRole;
 }
 
+bool AXImageMapLink::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReasons) const
+{
+    return accessibilityIsIgnoredByDefault(ignoredReasons);
+}
+
 Element* AXImageMapLink::actionElement() const
 {
     return anchorElement();
 }
 
 Element* AXImageMapLink::anchorElement() const
 {
-    return m_areaElement.get();
+    return node() ? toElement(node()) : nullptr;
 }
 
 KURL AXImageMapLink::url() const
 {
-    if (!m_areaElement.get())
+    if (!areaElement())
         return KURL();
 
-    return m_areaElement->href();
+    return areaElement()->href();
 }
 
 String AXImageMapLink::deprecatedAccessibilityDescription() const
 {
     const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
     if (!ariaLabel.isEmpty())
         return ariaLabel;
     const AtomicString& alt = getAttribute(altAttr);
     if (!alt.isEmpty())
         return alt;
 
     return String();
 }
 
 String AXImageMapLink::deprecatedTitle(TextUnderElementMode mode) const
 {
     const AtomicString& title = getAttribute(titleAttr);
     if (!title.isEmpty())
         return title;
     const AtomicString& summary = getAttribute(summaryAttr);
     if (!summary.isEmpty())
         return summary;
 
     return String();
 }
 
 LayoutRect AXImageMapLink::elementRect() const
 {
-    if (!m_mapElement.get() || !m_areaElement.get())
+    HTMLAreaElement* area = areaElement();
+    HTMLMapElement* map = mapElement();
+    if (!area || !map)
         return LayoutRect();
 
     LayoutObject* layoutObject;
     if (m_parent && m_parent->isAXLayoutObject())
         layoutObject = toAXLayoutObject(m_parent)->layoutObject();
     else
-        layoutObject = m_mapElement->layoutObject();
+        layoutObject = map->layoutObject();
 
     if (!layoutObject)
         return LayoutRect();
 
-    return m_areaElement->computeRect(layoutObject);
+    return area->computeRect(layoutObject);
 }
 
 DEFINE_TRACE(AXImageMapLink)
 {
-    visitor->trace(m_areaElement);
-    visitor->trace(m_mapElement);
-    AXMockObject::trace(visitor);
+    AXNodeObject::trace(visitor);
 }
 
 } // namespace blink