<!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>[190703] 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/190703">190703</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-07 19:26:13 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>script.text shouldn't include text from non-direct children of the script element
https://bugs.webkit.org/show_bug.cgi?id=148851
<rdar://problem/22587759>
Patch by Keith Rollin <krollin@apple.com> on 2015-10-07
Reviewed by Chris Dumez.
LayoutTests/imported/w3c:
Rebaseline several W3C HTML tests now that new checks are passing.
* web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt:
* web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml-expected.txt:
Source/WebCore:
Don't include text from non-direct children in script.text. Per:
https://html.spec.whatwg.org/multipage/scripting.html#dom-script-text
Chrome and Firefox behavior match the spec.
Test: fast/dom/script-subtext-in-script-elements.html
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::scriptContent):
LayoutTests:
script-getElementById-during-insertion removed because it no longer
runs correctly with this change.
* fast/dom/script-getElementById-during-insertion-expected.txt: Removed.
* fast/dom/script-getElementById-during-insertion.html: Removed.
* fast/dom/script-subtext-in-script-elements-expected.txt: Added.
* fast/dom/script-subtext-in-script-elements.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsscripting1thescriptelementscripttextexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsscripting1thescriptelementscripttextxhtmlexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomscriptsubtextinscriptelementsexpectedtxt">trunk/LayoutTests/fast/dom/script-subtext-in-script-elements-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomscriptsubtextinscriptelementshtml">trunk/LayoutTests/fast/dom/script-subtext-in-script-elements.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomscriptgetElementByIdduringinsertionexpectedtxt">trunk/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomscriptgetElementByIdduringinsertionhtml">trunk/LayoutTests/fast/dom/script-getElementById-during-insertion.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/LayoutTests/ChangeLog 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-07 Keith Rollin <krollin@apple.com>
+
+ script.text shouldn't include text from non-direct children of the script element
+ https://bugs.webkit.org/show_bug.cgi?id=148851
+ <rdar://problem/22587759>
+
+ Reviewed by Chris Dumez.
+
+ script-getElementById-during-insertion removed because it no longer
+ runs correctly with this change.
+
+ * fast/dom/script-getElementById-during-insertion-expected.txt: Removed.
+ * fast/dom/script-getElementById-during-insertion.html: Removed.
+ * fast/dom/script-subtext-in-script-elements-expected.txt: Added.
+ * fast/dom/script-subtext-in-script-elements.html: Added.
+
</ins><span class="cx"> 2015-10-07 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Test font-variant-* and font-feature-settings with TrueType fonts
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomscriptgetElementByIdduringinsertionexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-PASS
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomscriptgetElementByIdduringinsertionhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/script-getElementById-during-insertion.html (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-getElementById-during-insertion.html 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/LayoutTests/fast/dom/script-getElementById-during-insertion.html 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<script>
-// Tests that we don't crash if a script is being executed as a result of appending a child to it.</p>
-executedScript = false;
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-</head>
-<body>
-<div id="test"></div>
-<script>
-var elem = document.getElementById("test");
-if (!executedScript) {
- executedScript = true;
-
- document.documentElement.appendChild(elem.cloneNode(true));
-
- var range = document.createRange();
- range.setStartBefore(document.body);
- range.setEndAfter(document.body);
- range.surroundContents(document.head.appendChild(document.createElement("script")));
-} else {
- var span = document.createElement("span");
- document.documentElement.appendChild(span);
- span.innerHTML = 'PASS<br/>';
-}
-</script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomscriptsubtextinscriptelementsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/script-subtext-in-script-elements-expected.txt (0 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-subtext-in-script-elements-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/script-subtext-in-script-elements-expected.txt 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Ensure that Text nodes that are not direct children of Script elements are not included for execution.
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomscriptsubtextinscriptelementshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/script-subtext-in-script-elements.html (0 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/script-subtext-in-script-elements.html (rev 0)
+++ trunk/LayoutTests/fast/dom/script-subtext-in-script-elements.html 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+
+<body>
+ <p>Ensure that Text nodes that are not direct children of Script elements are not included for execution.</p>
+ <div id="result">FAIL</div>
+ <script>
+ // See https://html.spec.whatwg.org/multipage/scripting.html#dom-script-text
+ // See <rdar://problem/22587759> script.text shouldn't include text from non-direct children of the script element (148851)
+
+ var script = document.createElement("script");
+ script.appendChild(document.createTextNode("document.getElementById('result').innerHTML = 'PASS';"));
+ var div = script.appendChild(document.createElement("div"));
+ div.appendChild(document.createTextNode("document.getElementById('result').innerHTML = 'FAIL';"))
+ document.body.appendChild(script);
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-07 Keith Rollin <krollin@apple.com>
+
+ script.text shouldn't include text from non-direct children of the script element
+ https://bugs.webkit.org/show_bug.cgi?id=148851
+ <rdar://problem/22587759>
+
+ Reviewed by Chris Dumez.
+
+ Rebaseline several W3C HTML tests now that new checks are passing.
+
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml-expected.txt:
+
</ins><span class="cx"> 2015-10-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] 'length' property is wrong for variadic operations
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsscripting1thescriptelementscripttextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><del>-FAIL Getter assert_equals: expected " TEXT " but got " TEXT ELEMENT"
</del><ins>+PASS Getter
</ins><span class="cx"> PASS Setter (non-empty string)
</span><span class="cx"> FAIL Setter (empty string) assert_equals: expected null but got Text node ""
</span><span class="cx"> FAIL Setter (null) assert_equals: expected "null" but got ""
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsscripting1thescriptelementscripttextxhtmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml-expected.txt (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml-expected.txt 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-xhtml-expected.txt 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx">
</span><del>-FAIL Getter with CDATA section assert_equals: expected "\n\n\n var x = \"y\";\n\n" but got "\n7;\n\n var x = \"y\";\n\n"
</del><ins>+PASS Getter with CDATA section
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/Source/WebCore/ChangeLog 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-10-07 Keith Rollin <krollin@apple.com>
+
+ script.text shouldn't include text from non-direct children of the script element
+ https://bugs.webkit.org/show_bug.cgi?id=148851
+ <rdar://problem/22587759>
+
+ Reviewed by Chris Dumez.
+
+ Don't include text from non-direct children in script.text. Per:
+ https://html.spec.whatwg.org/multipage/scripting.html#dom-script-text
+ Chrome and Firefox behavior match the spec.
+
+ Test: fast/dom/script-subtext-in-script-elements.html
+
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::scriptContent):
+
</ins><span class="cx"> 2015-10-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Partial revert of r187626 as it caused a PLT regression
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (190702 => 190703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2015-10-08 02:06:40 UTC (rev 190702)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2015-10-08 02:26:13 UTC (rev 190703)
</span><span class="lines">@@ -382,7 +382,10 @@
</span><span class="cx">
</span><span class="cx"> String ScriptElement::scriptContent() const
</span><span class="cx"> {
</span><del>- return TextNodeTraversal::contentsAsString(m_element);
</del><ins>+ StringBuilder result;
+ for (auto* text = TextNodeTraversal::firstChild(m_element); text; text = TextNodeTraversal::nextSibling(*text))
+ result.append(text->data());
+ return result.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptElement* toScriptElementIfPossible(Element* element)
</span></span></pre>
</div>
</div>
</body>
</html>