Fall back to title element text for SVG root text alternatives

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

 /*
  * Copyright (C) 2012, 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 37 matching lines @@
 #include "core/html/HTMLTableCaptionElement.h"
 #include "core/html/HTMLTableCellElement.h"
 #include "core/html/HTMLTableElement.h"
 #include "core/html/HTMLTableRowElement.h"
 #include "core/html/HTMLTableSectionElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/shadow/MediaControlElements.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/LayoutObject.h"
+#include "core/svg/SVGElement.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/text/PlatformLocale.h"
 #include "wtf/text/StringBuilder.h"
 
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 2294 matching lines @@
                 source.text = textAlternative;
                 *foundTextAlternative = true;
             } else {
                 return textAlternative;
             }
         }
 
         return textAlternative;
     }
 
+    // Per SVG AAM 1.0's modifications to 2D of this algorithm.
+    if (node()->isSVGElement()) {
+        Element* title = nullptr;

[aboxhall, 2015/12/15 19:56:03]

Before this line, add:

nameFrom = AXNameFromRelatedElement;
if (nameSources) {
    nameSources->append(NameSource(*foundTextAlternative));
    nameSources->last().type = nameFrom;
    nameSources->last().nativeSource = AXTextFromNativeHTMLTitleElement;   //
will need to update test expectation as well
}

Then you don't need line 2388 or 2391 - and you don't need line 2389 either
because it's not an attribute, but a related element (details/summary and
fieldset/legend use a similar pattern, see below).

The reason for initializing the nameSource first up is that nameSources tracks
_potential_ as well as actual name sources, so we add in the nameSource
"optimistically" and then fill it in if we actually find something. And we set
nameFrom at the same time because nameSources may be null (and the code will
potentially early-out much sooner if it is), but nameFrom is used outside it.

+        for (Element& element : ElementTraversal::descendantsOf(*(node()))) {
+            if (element.hasTagName(SVGNames::titleTag)) {
+                title = &element;
+                break;
+            }
+        }
+
+        if (title) {
+            String text = title->innerText();
+            textAlternative = text;
+            if (nameSources) {
+                NameSource& source = nameSources->last();
+                source.type = AXNameFromTitle;
+                source.attributeValue = AtomicString(text);
+                source.text = textAlternative;
+                source.nativeSource = AXTextFromNativeHTMLTitleElement;
+                *foundTextAlternative = true;
+            } else {
+                return textAlternative;
+            }
+        }
+
+        return textAlternative;
+    }
+
     // Fieldset / legend.
     if (isHTMLFieldSetElement(node())) {
         nameFrom = AXNameFromRelatedElement;
         if (nameSources) {
             nameSources->append(NameSource(*foundTextAlternative));
             nameSources->last().type = nameFrom;
             nameSources->last().nativeSource = AXTextFromNativeHTMLLegend;
         }
         HTMLElement* legend = toHTMLFieldSetElement(node())->legend();
         if (legend) {
@@ skipping 312 matching lines @@
     return placeholder;
 }
 
 DEFINE_TRACE(AXNodeObject)
 {
     visitor->trace(m_node);
     AXObject::trace(visitor);
 }
 
 } // namespace blin