Switch all LayoutTests to use new AX name calculation

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 18 matching lines @@
 #include "config.h"
 #include "modules/accessibility/AXObject.h"
 
 #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"

[aboxhall, 2015/11/05 17:49:21]

Unused?

[dmazzoni, 2015/11/06 00:21:17]

It's where we get isHTMLSpace

 #include "core/layout/LayoutListItem.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/LayoutView.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/text/PlatformLocale.h"
 #include "wtf/HashSet.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/WTFString.h"
 
@@ skipping 623 matching lines @@
 {
     updateCachedAttributeValuesIfNeeded();
     return m_cachedIsPresentationalChild;
 }
 
 String AXObject::name(AXNameFrom& nameFrom, AXObject::AXObjectVector* nameObjects) const
 {
     HeapHashSet<Member<const AXObject>> visited;
     AXRelatedObjectVector relatedObjects;
     String text = textAlternative(false, false, visited, nameFrom, &relatedObjects, nullptr);
+
+    if (!node() || !isHTMLBRElement(node()))
+        text = text.simplifyWhiteSpace(isHTMLSpace<UChar>);
+
     if (nameObjects) {
         nameObjects->clear();
         for (size_t i = 0; i < relatedObjects.size(); i++)
             nameObjects->append(relatedObjects[i]->object);
     }
     return text;
 }
 
 String AXObject::name(NameSources* nameSources) const
 {
     AXObjectSet visited;
     AXNameFrom tmpNameFrom;
     AXRelatedObjectVector tmpRelatedObjects;
-    return textAlternative(false, false, visited, tmpNameFrom, &tmpRelatedObjects, nameSources);
+    String text = textAlternative(false, false, visited, tmpNameFrom, &tmpRelatedObjects, nameSources);
+    text = text.simplifyWhiteSpace(isHTMLSpace<UChar>);
+    return text;
 }
 
 String AXObject::recursiveTextAlternative(const AXObject& axObj, bool inAriaLabelledByTraversal, AXObjectSet& visited)
 {
     AXNameFrom tmpNameFrom;
     return axObj.textAlternative(true, inAriaLabelledByTraversal, visited, tmpNameFrom, nullptr, nullptr);
 }
 
 AccessibilityOrientation AXObject::orientation() const
 {
@@ skipping 747 matching lines @@
             return true;
     }
     return false;
 }
 
 bool AXObject::nameFromContents() const
 {
     switch (roleValue()) {
     case ButtonRole:
     case CheckBoxRole:
-    case CellRole:
-    case ColumnHeaderRole:
     case DirectoryRole:
     case DisclosureTriangleRole:
+    case HeadingRole:
+    case LineBreakRole:
     case LinkRole:
+    case ListBoxOptionRole:
     case ListItemRole:
     case MenuItemRole:
     case MenuItemCheckBoxRole:
     case MenuItemRadioRole:
     case MenuListOptionRole:
     case RadioButtonRole:
-    case RowHeaderRole:
     case StaticTextRole:
     case StatusRole:
     case SwitchRole:
+    case TabRole:
+    case ToggleButtonRole:
     case TreeItemRole:
         return true;
     default:
         return false;
     }
 }
 
 AccessibilityRole AXObject::buttonRoleType() const
 {
     // If aria-pressed is present, then it should be exposed as a toggle button.
@@ skipping 24 matching lines @@
 
 DEFINE_TRACE(AXObject)
 {
     visitor->trace(m_children);
     visitor->trace(m_parent);
     visitor->trace(m_cachedLiveRegionRoot);
     visitor->trace(m_axObjectCache);
 }
 
 } // namespace blink