Make use of new AX name calc in Chromium.

third_party/WebKit/Source/modules/accessibility/AXListBoxOption.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 120 matching lines @@
     if (toHTMLOptionElement(node())->isDisabledFormControl())
         return false;
 
     HTMLSelectElement* selectElement = listBoxOptionParentNode();
     if (selectElement && selectElement->isDisabledFormControl())
         return false;
 
     return true;
 }
 
-String AXListBoxOption::stringValue() const
+String AXListBoxOption::textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const
 {
     if (!node())
         return String();
 
     const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
-    if (!ariaLabel.isNull())
+    if (!ariaLabel.isEmpty()) {
+        nameFrom = AXNameFromAttribute;
+        if (nameSources) {
+            nameSources->append(NameSource(false, aria_labelAttr));
+            nameSources->last().type = nameFrom;
+            nameSources->last().text = ariaLabel;
+        }
         return ariaLabel;

[aboxhall, 2015/11/16 22:03:28]

Note: we shouldn't return immediately if nameSources exists, but instead
continue to get all the possible name source options. See
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...
for an example of this in AXNodeObject.

[dmazzoni, 2015/11/17 17:04:29]

Got it.

I refactored this out into a new helper, ariaTextAlternative, which we now call
from three places. That gets rid of even more duplication than before.

[aboxhall, 2015/11/17 20:06:21]

Nice.

+    }
 
-    if (isHTMLOptionElement(node()))
-        return toHTMLOptionElement(node())->displayLabel();
+    if (!isHTMLOptionElement(node()))
+        return String();
 
-    return String();
+    nameFrom = AXNameFromContents;
+    if (nameSources) {
+        nameSources->append(NameSource(false));

[aboxhall, 2015/11/16 22:03:28]

Then, this needs to be dependent on whether we found an aria-label above or not.

[dmazzoni, 2015/11/17 17:04:29]

Done.

+        nameSources->last().type = nameFrom;
+        nameSources->last().text = toHTMLOptionElement(node())->displayLabel();
+    }
+
+    return toHTMLOptionElement(node())->displayLabel();
 }
 
 void AXListBoxOption::setSelected(bool selected)
 {
     HTMLSelectElement* selectElement = listBoxOptionParentNode();
     if (!selectElement)
         return;
 
     if (!canSetSelectedAttribute())
         return;
@@ skipping 28 matching lines @@
     unsigned length = listItems.size();
     for (unsigned i = 0; i < length; i++) {
         if (listItems[i] == node())
             return i;
     }
 
     return -1;
 }
 
 } // namespace blink