Chromium Code Reviews| 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..7fc4252d69c8685eee32dd7b913d96ea944a3ee1 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,12 @@ void Document::setTitleElement(Element* titleElement) |
| m_titleElement = titleElement; |
| } |
| + if (isSVGDocument() && ((isSVGSVGElement(documentElement()) && isHTMLTitleElement(m_titleElement)) |
|
fs
2016/03/04 13:11:08
I think a comment/spec quote here would be reasona
hyunjunekim2
2016/03/04 14:42:17
Done.
|
| + || (!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)) |