Fix SVGDocument return title that is not a child of the root element

third_party/WebKit/Source/core/dom/Document.cpp

Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 64f72e837e40d3a5cb3d7d72c4b4a0cc95adb60d..d37e59291245b6a4328c89964545617a146e2f6d 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -1286,18 +1286,29 @@ void Document::updateTitle(const String& title)
 void Document::setTitle(const String& title)
 {
     // Title set by JavaScript -- overrides any title elements.
-    if (!isHTMLDocument() && !isXHTMLDocument()) {
-        m_titleElement = nullptr;
-    } else if (!m_titleElement) {
-        HTMLElement* headElement = head();
-        if (!headElement)
-            return;
-        m_titleElement = HTMLTitleElement::create(*this);
-        headElement->appendChild(m_titleElement.get());
+    if (!m_titleElement) {
+        if (isHTMLDocument() || isXHTMLDocument()) {
+            HTMLElement* headElement = head();
+            if (!headElement)
+                return;
+            m_titleElement = HTMLTitleElement::create(*this);
+            headElement->appendChild(m_titleElement.get());
+        } else if (isSVGDocument()) {
+            Element* element = documentElement();
+            if (!isSVGSVGElement(element))
+                return;
+            m_titleElement = SVGTitleElement::create(*this);
+            element->insertBefore(m_titleElement.get(), element->firstChild());
+        }
+    } else {
+        if (!isHTMLDocument() && !isXHTMLDocument() && !isSVGDocument())
+            m_titleElement = nullptr;
     }
 
     if (isHTMLTitleElement(m_titleElement))
         toHTMLTitleElement(m_titleElement)->setText(title);
+    else if (isSVGTitleElement(m_titleElement))
+        toSVGTitleElement(m_titleElement)->setText(title);
     else
         updateTitle(title);
 }
@@ -1315,6 +1326,24 @@ void Document::setTitleElement(Element* titleElement)
         m_titleElement = titleElement;
     }
 
+
+    if (isSVGDocument()) {
+        // If the root element that is svg element is not the parent of title element, ignore title element.

[fs, 2016/03/04 14:57:12]

Nit: I'd suggest that you change "svg element" to "<svg> element" to make it
even more clear that we're talking about <svg> specifically and not "a svg
element" (element in the svg namespace) in general.

[hyunjunekim2, 2016/03/04 15:14:44]

Done.

+        if (isSVGSVGElement(documentElement()) && documentElement() != m_titleElement->parentNode()) {

[hyunjunekim2, 2016/03/04 14:42:17]

Added condition whether the root or not.

+            m_titleElement = nullptr;
+            return;
+        }
+
+        // If the root element is not svg element and title element is in svg namespace,

[fs, 2016/03/04 14:57:12]

Same here.

[hyunjunekim2, 2016/03/04 15:14:44]

Done.

+        // or the root element is svg element and title element is not in svg namespace,
+        // ignore the title element.
+        if ((!isSVGSVGElement(m_titleElement->parentNode()) && isSVGTitleElement(m_titleElement))

[hyunjunekim2, 2016/03/04 14:42:17]

Has two case,
First condition, the root element is not svg element and title element is in svg
namespace,
Test)
var doc = document.implementation.createDocument(SVG_NAMESPACE, "SVG", null);
doc.documentElement.appendChild(doc.createElementNS(SVG_NAMESPACE, "title"));
doc.documentElement.lastChild.textContent = "foo";
assert_equals(doc.title, "");

// But an HTML title is respected
doc.documentElement.appendChild(doc.createElementNS(HTML_NAMESPACE, "title"));
doc.documentElement.lastChild.textContent = "bar";
assert_equals(doc.title, "bar");

Second condition, the root element is svg element and title element is not in
svg namespace,
var doc = newSVGDocument();
var title = doc.createElementNS(HTML_NAMESPACE, "title");
title.textContent = "foo";
doc.documentElement.appendChild(title);
assert_equals(doc.title, "");

[fs, 2016/03/04 14:57:12]

Acknowledged.

+            || (isSVGSVGElement(m_titleElement->parentNode()) && !isSVGTitleElement(m_titleElement))) {
+            m_titleElement = nullptr;
+            return;
+        }
+    }
+
     if (isHTMLTitleElement(m_titleElement))
         updateTitle(toHTMLTitleElement(m_titleElement)->text());
     else if (isSVGTitleElement(m_titleElement))