Handling of different types of empty alt

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

Index: third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
index a256d1cd52c259edd47d945e48393e56fb0497f3..456c55b8d5ac45aa13564b178d73bd3eccbade19 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
@@ -1862,7 +1862,10 @@ String AXNodeObject::TextAlternative(bool recursive,
   text_alternative =
       NativeTextAlternative(visited, name_from, related_objects, name_sources,
                             &found_text_alternative);
-  if (!text_alternative.IsEmpty() && !name_sources)
+  const bool has_text_alternative =
+      !text_alternative.IsEmpty() ||
+      name_from == kAXNameFromExplicitlyEmptyAttribute;
+  if (has_text_alternative && !name_sources)
     return text_alternative;
 
   // Step 2F / 2G from: http://www.w3.org/TR/accname-aam-1.1
@@ -2631,12 +2634,14 @@ String AXNodeObject::NativeTextAlternative(
   if (input_element &&
       input_element->getAttribute(typeAttr) == InputTypeNames::image) {
     // alt attr
-    name_from = kAXNameFromAttribute;
+    const AtomicString& alt = input_element->getAttribute(altAttr);
+    const bool isEmpty = alt.IsEmpty() && !alt.IsNull();

[dmazzoni, 2017/05/01 17:49:23]

nit: isEmpty -> is_empty (just as you were getting used
to the style! At least it's consistent everywhere now)

[aleventhal, 2017/05/17 17:45:47]

What would I do without you! :)

+    name_from =
+        isEmpty ? kAXNameFromExplicitlyEmptyAttribute : kAXNameFromAttribute;
     if (name_sources) {
       name_sources->push_back(NameSource(*found_text_alternative, altAttr));
       name_sources->back().type = name_from;
     }
-    const AtomicString& alt = input_element->getAttribute(altAttr);
     if (!alt.IsNull()) {
       text_alternative = alt;
       if (name_sources) {
@@ -2778,12 +2783,14 @@ String AXNodeObject::NativeTextAlternative(
   if (isHTMLImageElement(GetNode()) || isHTMLAreaElement(GetNode()) ||
       (GetLayoutObject() && GetLayoutObject()->IsSVGImage())) {
     // alt
-    name_from = kAXNameFromAttribute;
+    const AtomicString& alt = GetAttribute(altAttr);
+    const bool isEmpty = alt.IsEmpty() && !alt.IsNull();
+    name_from =
+        isEmpty ? kAXNameFromExplicitlyEmptyAttribute : kAXNameFromAttribute;
     if (name_sources) {
       name_sources->push_back(NameSource(*found_text_alternative, altAttr));
       name_sources->back().type = name_from;
     }
-    const AtomicString& alt = GetAttribute(altAttr);
     if (!alt.IsNull()) {
       text_alternative = alt;
       if (name_sources) {