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 36 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 2303 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()) {
+        nameFrom = AXNameFromRelatedElement;
+        if (nameSources) {
+            nameSources->append(NameSource(*foundTextAlternative));
+            nameSources->last().type = nameFrom;
+            nameSources->last().nativeSource = AXTextFromNativeHTMLTitleElement;
+        }
+        DCHECK(node()->isContainerNode());

[dmazzoni, 2016/01/12 16:23:38]

This should be ASSERT

[Elly Fong-Jones, 2016/01/13 16:51:51]

Done.

+        Element* title = ElementTraversal::firstChild(
+            toContainerNode(*(node())),
+            HasTagName(SVGNames::titleTag));
+
+        if (title) {
+            AXObject* titleAXObject = axObjectCache().getOrCreate(title);
+            if (titleAXObject && !visited.contains(titleAXObject)) {
+                textAlternative = recursiveTextAlternative(*titleAXObject, false, visited);
+                if (relatedObjects) {
+                    localRelatedObjects.append(new NameSourceRelatedObject(
+                        titleAXObject, textAlternative));
+                    *relatedObjects = localRelatedObjects;
+                    localRelatedObjects.clear();
+                }
+            }
+            if (nameSources) {
+                NameSource& source = nameSources->last();
+                source.text = textAlternative;
+                source.relatedObjects = *relatedObjects;
+                *foundTextAlternative = true;
+            } else {
+                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