<!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>[202951] 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/202951">202951</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-07 18:15:48 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTMLTitleElement.text should only account for direct children Text nodes
https://bugs.webkit.org/show_bug.cgi?id=159536
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline now that more checks are passing.
* web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01-expected.txt:
* web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02-expected.txt:
Source/WebCore:
HTMLTitleElement.text should only account for direct children Text nodes:
- https://html.spec.whatwg.org/multipage/semantics.html#dom-title-text
- https://html.spec.whatwg.org/multipage/infrastructure.html#child-text-content
Firefox and Chrome match the specification. However, WebKit accounted for all
Text nodes that are descendants, not just children. This patch aligns our
behavior with the specification and other browsers.
No new tests, rebaselined existing tests.
* html/HTMLTitleElement.cpp:
(WebCore::HTMLTitleElement::text):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathetitleelementtitletext01expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathetitleelementtitletext02expectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTitleElementcpp">trunk/Source/WebCore/html/HTMLTitleElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (202950 => 202951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-08 00:20:38 UTC (rev 202950)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-08 01:15:48 UTC (rev 202951)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-07-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ HTMLTitleElement.text should only account for direct children Text nodes
+ https://bugs.webkit.org/show_bug.cgi?id=159536
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline now that more checks are passing.
+
+ * web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01-expected.txt:
+ * web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02-expected.txt:
+
+2016-07-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> td / th should be exposed as HTMLTableCellElement objects
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159518
</span><span class="cx"> <rdar://problem/27225436>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathetitleelementtitletext01expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01-expected.txt (202950 => 202951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01-expected.txt 2016-07-08 00:20:38 UTC (rev 202950)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-01-expected.txt 2016-07-08 01:15:48 UTC (rev 202951)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx">
</span><del>-FAIL COMMENT assert_equals: expected "TEXT" but got "TEXTELEMENT"
</del><ins>+PASS COMMENT
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathetitleelementtitletext02expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02-expected.txt (202950 => 202951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02-expected.txt 2016-07-08 00:20:38 UTC (rev 202950)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-title-element/title.text-02-expected.txt 2016-07-08 01:15:48 UTC (rev 202951)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx">
</span><del>-FAIL COMMENT assert_equals: expected "TEXT" but got "TEXTELEMENT"
</del><ins>+PASS COMMENT
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202950 => 202951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-08 00:20:38 UTC (rev 202950)
+++ trunk/Source/WebCore/ChangeLog 2016-07-08 01:15:48 UTC (rev 202951)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-07-07 Chris Dumez <cdumez@apple.com>
+
+ HTMLTitleElement.text should only account for direct children Text nodes
+ https://bugs.webkit.org/show_bug.cgi?id=159536
+
+ Reviewed by Ryosuke Niwa.
+
+ HTMLTitleElement.text should only account for direct children Text nodes:
+ - https://html.spec.whatwg.org/multipage/semantics.html#dom-title-text
+ - https://html.spec.whatwg.org/multipage/infrastructure.html#child-text-content
+
+ Firefox and Chrome match the specification. However, WebKit accounted for all
+ Text nodes that are descendants, not just children. This patch aligns our
+ behavior with the specification and other browsers.
+
+ No new tests, rebaselined existing tests.
+
+ * html/HTMLTitleElement.cpp:
+ (WebCore::HTMLTitleElement::text):
+
</ins><span class="cx"> 2016-07-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r200769): animations are no longer overridden
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTitleElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTitleElement.cpp (202950 => 202951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTitleElement.cpp 2016-07-08 00:20:38 UTC (rev 202950)
+++ trunk/Source/WebCore/html/HTMLTitleElement.cpp 2016-07-08 01:15:48 UTC (rev 202951)
</span><span class="lines">@@ -74,7 +74,10 @@
</span><span class="cx">
</span><span class="cx"> String HTMLTitleElement::text() const
</span><span class="cx"> {
</span><del>- return TextNodeTraversal::contentsAsString(*this);
</del><ins>+ StringBuilder result;
+ for (Text* text = TextNodeTraversal::firstChild(*this); text; text = TextNodeTraversal::nextSibling(*text))
+ result.append(text->data());
+ return result.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringWithDirection HTMLTitleElement::computedTextWithDirection()
</span></span></pre>
</div>
</div>
</body>
</html>