<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202895] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202895">202895</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-06 22:55:30 -0700 (Wed, 06 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Document.title setter does not work for SVG documents
https://bugs.webkit.org/show_bug.cgi?id=159503
<rdar://problem/27212313>
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C test now that all checks are passing.
* web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09-expected.txt:
Source/WebCore:
Document.title setter should work for SVG documents:
- https://html.spec.whatwg.org/multipage/dom.html#document.title
This patch aligns our behavior with the specification
and with Firefox / Chrome.
No new tests, rebaselined existing test.
* dom/Document.cpp:
(WebCore::Document::setTitle):
- Reverse the if conditions for clarity.
- If the document element is an SVG svg element, create a
SVGTitleElement and insert it as first child of the
document element.
- Call SVGTitleElement::setText() instead of
HTMLTitleElement::setText() at the end of the method if
m_titleElement is a SVGTitleElement.
(WebCore::Document::updateTitleElement):
- If document element is an SVG svg element, use the first
child of the document element that is a SVGTitleElement.
* svg/SVGTitleElement.cpp:
(WebCore::SVGTitleElement::setText):
* svg/SVGTitleElement.h:
Add SVGTitleElement::setText() method that does the same
thing as HTMLTitleElement::setText().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsdomtreeaccessorsdocumenttitle09expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTitleElementcpp">trunk/Source/WebCore/html/HTMLTitleElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTitleElementcpp">trunk/Source/WebCore/svg/SVGTitleElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTitleElementh">trunk/Source/WebCore/svg/SVGTitleElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (202894 => 202895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-07 05:41:01 UTC (rev 202894)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-07 05:55:30 UTC (rev 202895)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-07-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Document.title setter does not work for SVG documents
+ https://bugs.webkit.org/show_bug.cgi?id=159503
+ <rdar://problem/27212313>
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C test now that all checks are passing.
+
+ * web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09-expected.txt:
+
+2016-07-06 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Align Document.body setter with the HTML specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159490
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsdomtreeaccessorsdocumenttitle09expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09-expected.txt (202894 => 202895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09-expected.txt 2016-07-07 05:41:01 UTC (rev 202894)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/document.title-09-expected.txt 2016-07-07 05:55:30 UTC (rev 202895)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx">
</span><del>-FAIL No title element in SVG document assert_equals: expected "title" but got "x-child"
-FAIL Title element in SVG document assert_equals: expected "foobar" but got "foo"
-FAIL Title element not child of SVG root assert_equals: expected "" but got "foo"
-FAIL Title element not in SVG namespace assert_equals: expected "" but got "foo"
-FAIL Root element not named "svg" assert_equals: expected "" but got "foo"
</del><ins>+PASS No title element in SVG document
+PASS Title element in SVG document
+PASS Title element not child of SVG root
+PASS Title element not in SVG namespace
+PASS Root element not named "svg"
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202894 => 202895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-07 05:41:01 UTC (rev 202894)
+++ trunk/Source/WebCore/ChangeLog 2016-07-07 05:55:30 UTC (rev 202895)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2016-07-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Document.title setter does not work for SVG documents
+ https://bugs.webkit.org/show_bug.cgi?id=159503
+ <rdar://problem/27212313>
+
+ Reviewed by Ryosuke Niwa.
+
+ Document.title setter should work for SVG documents:
+ - https://html.spec.whatwg.org/multipage/dom.html#document.title
+
+ This patch aligns our behavior with the specification
+ and with Firefox / Chrome.
+
+ No new tests, rebaselined existing test.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setTitle):
+ - Reverse the if conditions for clarity.
+ - If the document element is an SVG svg element, create a
+ SVGTitleElement and insert it as first child of the
+ document element.
+ - Call SVGTitleElement::setText() instead of
+ HTMLTitleElement::setText() at the end of the method if
+ m_titleElement is a SVGTitleElement.
+
+ (WebCore::Document::updateTitleElement):
+ - If document element is an SVG svg element, use the first
+ child of the document element that is a SVGTitleElement.
+
+ * svg/SVGTitleElement.cpp:
+ (WebCore::SVGTitleElement::setText):
+ * svg/SVGTitleElement.h:
+ Add SVGTitleElement::setText() method that does the same
+ thing as HTMLTitleElement::setText().
+
+2016-07-06 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Align Document.body setter with the HTML specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159490
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (202894 => 202895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-07-07 05:41:01 UTC (rev 202894)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-07-07 05:55:30 UTC (rev 202895)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><span class="cx"> * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
</span><del>- * Copyright (C) 2004-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGElementFactory.h"
</span><span class="cx"> #include "SVGNames.h"
</span><ins>+#include "SVGSVGElement.h"
</ins><span class="cx"> #include "SVGTitleElement.h"
</span><span class="cx"> #include "SVGZoomEvent.h"
</span><span class="cx"> #include "SchemeRegistry.h"
</span><span class="lines">@@ -1620,15 +1621,22 @@
</span><span class="cx">
</span><span class="cx"> void Document::setTitle(const String& title)
</span><span class="cx"> {
</span><del>- if (!isHTMLDocument() && !isXHTMLDocument())
</del><ins>+ if (!m_titleElement) {
+ if (isHTMLDocument() || isXHTMLDocument()) {
+ auto* headElement = head();
+ if (!headElement)
+ return;
+ 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())
</ins><span class="cx"> m_titleElement = nullptr;
</span><del>- else if (!m_titleElement) {
- auto* headElement = head();
- if (!headElement)
- return;
- m_titleElement = createElement(titleTag, false);
- headElement->appendChild(*m_titleElement, ASSERT_NO_EXCEPTION);
- }
</del><span class="cx">
</span><span class="cx"> // The DOM API has no method of specifying direction, so assume LTR.
</span><span class="cx"> updateTitle(StringWithDirection(title, LTR));
</span><span class="lines">@@ -1635,18 +1643,21 @@
</span><span class="cx">
</span><span class="cx"> if (is<HTMLTitleElement>(m_titleElement.get()))
</span><span class="cx"> downcast<HTMLTitleElement>(*m_titleElement).setText(title);
</span><ins>+ else if (is<SVGTitleElement>(m_titleElement.get()))
+ downcast<SVGTitleElement>(*m_titleElement).setText(title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::updateTitleElement(Element* newTitleElement)
</span><span class="cx"> {
</span><del>- // Only allow the first title element in tree order to change the title -- others have no effect.
- if (m_titleElement) {
- if (isHTMLDocument() || isXHTMLDocument())
- m_titleElement = descendantsOfType<HTMLTitleElement>(*this).first();
- else if (isSVGDocument())
- m_titleElement = descendantsOfType<SVGTitleElement>(*this).first();
- } else
- m_titleElement = newTitleElement;
</del><ins>+ if (is<SVGSVGElement>(documentElement()))
+ m_titleElement = childrenOfType<SVGTitleElement>(*documentElement()).first();
+ else {
+ if (m_titleElement) {
+ if (isHTMLDocument() || isXHTMLDocument())
+ m_titleElement = descendantsOfType<HTMLTitleElement>(*this).first();
+ } else
+ m_titleElement = newTitleElement;
+ }
</ins><span class="cx">
</span><span class="cx"> updateTitleFromTitleElement();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTitleElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTitleElement.cpp (202894 => 202895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTitleElement.cpp 2016-07-07 05:41:01 UTC (rev 202894)
+++ trunk/Source/WebCore/html/HTMLTitleElement.cpp 2016-07-07 05:55:30 UTC (rev 202895)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> // We make a copy here because entity of "value" argument can be Document::m_title,
</span><span class="cx"> // which goes empty during removeChildren() invocation below,
</span><del>- // which causes HTMLTitleElement::childrenChanged(), which ends up Document::setTitle().
</del><ins>+ // which causes HTMLTitleElement::childrenChanged(), which ends up calling Document::setTitle().
</ins><span class="cx"> String valueCopy(value);
</span><span class="cx">
</span><span class="cx"> if (hasChildNodes())
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTitleElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTitleElement.cpp (202894 => 202895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTitleElement.cpp 2016-07-07 05:41:01 UTC (rev 202894)
+++ trunk/Source/WebCore/svg/SVGTitleElement.cpp 2016-07-07 05:55:30 UTC (rev 202895)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
</span><span class="cx"> * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
</span><ins>+ * Copyright (C) 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -23,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "SVGNames.h"
</span><ins>+#include "Text.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -61,4 +63,25 @@
</span><span class="cx"> document().titleElementTextChanged(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SVGTitleElement::setText(const String& value)
+{
+ Ref<SVGTitleElement> protectedThis(*this);
+
+ if (!value.isEmpty() && hasOneChild() && is<Text>(*firstChild())) {
+ downcast<Text>(*firstChild()).setData(value);
+ return;
+ }
+
+ // We make a copy here because entity of "value" argument can be Document::m_title,
+ // which goes empty during removeChildren() invocation below,
+ // which causes SVGTitleElement::childrenChanged(), which ends up calling Document::setTitle().
+ String valueCopy(value);
+
+ if (hasChildNodes())
+ removeChildren();
+
+ if (!valueCopy.isEmpty())
+ appendChild(document().createTextNode(valueCopy), IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTitleElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTitleElement.h (202894 => 202895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTitleElement.h 2016-07-07 05:41:01 UTC (rev 202894)
+++ trunk/Source/WebCore/svg/SVGTitleElement.h 2016-07-07 05:55:30 UTC (rev 202895)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<SVGTitleElement> create(const QualifiedName&, Document&);
</span><span class="cx">
</span><ins>+ void setText(const String&);
+
</ins><span class="cx"> private:
</span><span class="cx"> SVGTitleElement(const QualifiedName&, Document&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>