Switch all LayoutTests to use new AX name calculation

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

 /*
  * Copyright (C) 2014, 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 213 matching lines @@
         return false;
     LayoutObject* layoutObject = select->layoutObject();
     return layoutObject && layoutObject->isMenuList();
 }
 
 AXObject* AXObjectCacheImpl::get(Node* node)
 {
     if (!node)
         return 0;
 
-    AXID layoutID = node->layoutObject() ? m_layoutObjectMapping.get(node->layoutObject()) : 0;
+    // Menu list option and HTML area elements are indexed by DOM node, never by layout object.
+    LayoutObject* layoutObject = node->layoutObject();
+    if (isMenuListOption(node) || isHTMLAreaElement(node))
+        layoutObject = nullptr;
+
+    AXID layoutID = layoutObject ? m_layoutObjectMapping.get(layoutObject) : 0;
     ASSERT(!HashTraits<AXID>::isDeletedValue(layoutID));
 
     AXID nodeID = m_nodeObjectMapping.get(node);
     ASSERT(!HashTraits<AXID>::isDeletedValue(nodeID));
 
-    if (node->layoutObject() && nodeID && !layoutID && !isMenuListOption(node)) {
+    if (layoutObject && nodeID && !layoutID) {
         // This can happen if an AXNodeObject is created for a node that's not
         // laid out, but later something changes and it gets a layoutObject (like if it's
         // reparented).
         remove(nodeID);
         return 0;
     }
 
     if (layoutID)
         return m_objects.get(layoutID);
 
@@ skipping 80 matching lines @@
     }
 
     return AXLayoutObject::create(layoutObject, *this);
 }
 
 AXObject* AXObjectCacheImpl::createFromNode(Node* node)
 {
     if (isMenuListOption(node))
         return AXMenuListOption::create(toHTMLOptionElement(node), *this);
 
+    if (isHTMLAreaElement(node))
+        return AXImageMapLink::create(toHTMLAreaElement(node), *this);
+
     return AXNodeObject::create(node, *this);
 }
 
 AXObject* AXObjectCacheImpl::createFromInlineTextBox(AbstractInlineTextBox* inlineTextBox)
 {
     return AXInlineTextBox::create(inlineTextBox, *this);
 }
 
 AXObject* AXObjectCacheImpl::getOrCreate(Widget* widget)
 {
@@ skipping 34 matching lines @@
 }
 
 AXObject* AXObjectCacheImpl::getOrCreate(Node* node)
 {
     if (!node)
         return 0;
 
     if (AXObject* obj = get(node))
         return obj;
 
-    if (node->layoutObject())
+    // If the node has a layout object, prefer using that as the primary key for the AXObject,
+    // with the exception of an HTMLAreaElement, which is created based on its node.
+    if (node->layoutObject() && !isHTMLAreaElement(node))
         return getOrCreate(node->layoutObject());
 
     if (!node->parentElement())
         return 0;
 
     if (isHTMLHeadElement(node))
         return 0;
 
     AXObject* newObj = createFromNode(node);
 
@@ skipping 66 matching lines @@
 
     return getOrCreate(m_document->view());
 }
 
 AXObject* AXObjectCacheImpl::getOrCreate(AccessibilityRole role)
 {
     AXObject* obj = nullptr;
 
     // will be filled in...
     switch (role) {
-    case ImageMapLinkRole:
-        obj = AXImageMapLink::create(*this);
-        break;
     case ColumnRole:
         obj = AXTableColumn::create(*this);
         break;
     case TableHeaderContainerRole:
         obj = AXTableHeaderContainer::create(*this);
         break;
     case SliderThumbRole:
         obj = AXSliderThumb::create(*this);
         break;
     case MenuListPopupRole:
@@ skipping 865 matching lines @@
     visitor->trace(m_nodeObjectMapping);
 #endif
 
     visitor->trace(m_objects);
     visitor->trace(m_notificationsToPost);
 
     AXObjectCache::trace(visitor);
 }
 
 } // namespace blink