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..c5bb8fa8f064fe57ca7bc0d93dd2f099e6c985a3 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,10 +1326,22 @@ void Document::setTitleElement(Element* titleElement)
         m_titleElement = titleElement;
     }
 
-    if (isHTMLTitleElement(m_titleElement))
-        updateTitle(toHTMLTitleElement(m_titleElement)->text());
-    else if (isSVGTitleElement(m_titleElement))
-        updateTitle(toSVGTitleElement(m_titleElement)->textContent());
+    String titleText;

[fs, 2016/03/04 11:47:06]

This is not quite what I meant... (note that now you'll update the title
always.)

More like:

if (<is in SVG document but title structure is not proper>)
    m_titleElement = nullptr;

if (isHTMLTitleElement(m_titleElement))
   updateTitle(...);
...like before your change...

[hyunjunekim2, 2016/03/04 12:58:09]

Done.

+    if (isHTMLTitleElement(m_titleElement)) {
+        if (isSVGDocument() && isSVGSVGElement(documentElement())) {
+            m_titleElement = nullptr;
+            return;
+        }
+        titleText = toHTMLTitleElement(m_titleElement)->text();
+    } else if (isSVGTitleElement(m_titleElement)) {
+        if (!isSVGSVGElement(m_titleElement->parentNode())) {
+            m_titleElement = nullptr;
+            return;
+        }
+        titleText = toSVGTitleElement(m_titleElement)->textContent();
+    }
+
+    updateTitle(titleText);
 }
 
 void Document::removeTitle(Element* titleElement)