Changeset 238377 in webkit

Timestamp:

Nov 19, 2018 12:42:53 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Setting document.title should have no effect for non SVG/HTML documents
​https://bugs.webkit.org/show_bug.cgi?id=191643

Patch by Rob Buis <​rbuis@igalia.com> on 2018-11-19
Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg-expected.txt: Added.
• web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html: Added.

Source/WebCore:

Setting document.title should have no effect for non SVG/HTML documents,
see ​https://html.spec.whatwg.org/multipage/dom.html#document.title.

Behavior matches Firefox and Chrome.

Test: imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html

• dom/Document.cpp:

(WebCore::Document::setTitle):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2018-11-19  Rob Buis  <rbuis@igalia.com>
+
+        Setting document.title should have no effect for non SVG/HTML documents
+        https://bugs.webkit.org/show_bug.cgi?id=191643
+
+        Reviewed by Chris Dumez.
+
+        * web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg-expected.txt: Added.
+        * web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html: Added.
+
 2018-11-18  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-19  Rob Buis  <rbuis@igalia.com>
+
+        Setting document.title should have no effect for non SVG/HTML documents
+        https://bugs.webkit.org/show_bug.cgi?id=191643
+
+        Reviewed by Chris Dumez.
+
+        Setting document.title should have no effect for non SVG/HTML documents,
+        see https://html.spec.whatwg.org/multipage/dom.html#document.title.
+
+        Behavior matches Firefox and Chrome.
+
+        Test: imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-not-in-html-svg.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::setTitle):
+
 2018-11-19  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1581 +1581 @@
 void Document::setTitle(const String& title)
 {
-    if (!m_titleElement) {
-        if (isHTMLDocument() || isXHTMLDocument()) {
+    auto* element = documentElement();
+    if (is<SVGSVGElement>(element)) {
+        if (!m_titleElement) {
+            m_titleElement = SVGTitleElement::create(SVGNames::titleTag, *this);
+            element->insertBefore(*m_titleElement, element->firstChild());
+        }
+        m_titleElement->setTextContent(title);
+    } else if (is<HTMLElement>(element)) {
+        if (!m_titleElement) {
             auto* headElement = head();
             if (!headElement)
@@ -1588 +1595 @@
             m_titleElement = HTMLTitleElement::create(HTMLNames::titleTag, *this);
             headElement->appendChild(*m_titleElement);
-        } else if (isSVGDocument()) {
-            auto* element = documentElement();
-            if (!is<SVGSVGElement>(element))
-                return;
-            m_titleElement = SVGTitleElement::create(SVGNames::titleTag, *this);
-            element->insertBefore(*m_titleElement, element->firstChild());
         }
-    } else if (!isHTMLDocument() && !isXHTMLDocument() && !isSVGDocument()) {
-        // FIXME: What exactly is the point of this? This seems like a strange moment
-        // in time to demote something from being m_titleElement, when setting the
-        // value of the title attribute. Do we have test coverage for this?
-        m_titleElement = nullptr;
-    }
-
-    if (is<HTMLTitleElement>(m_titleElement.get()))
-        downcast<HTMLTitleElement>(*m_titleElement).setTextContent(title);
-    else if (is<SVGTitleElement>(m_titleElement.get()))
-        downcast<SVGTitleElement>(*m_titleElement).setTextContent(title);
-    else
-        updateTitle({ title, TextDirection::LTR });
+        m_titleElement->setTextContent(title);
+    }
 }