<!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>[205079] 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/205079">205079</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-08-27 10:45:12 -0700 (Sat, 27 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>script.text should behave like script.textContent on setting
<https://webkit.org/b/148852>
Reviewed by Chris Dumez.
LayoutTests/imported/w3c:
* web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt:
Source/WebCore:
HTMLScriptElement.text should behave just like .textContent when setting,
so just forward setText() to setTextContent().
Test: import/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text.html
* html/HTMLScriptElement.cpp:
(WebCore::HTMLScriptElement::setText):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLScriptElementcpp">trunk/Source/WebCore/html/HTMLScriptElement.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 (205078 => 205079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog        2016-08-27 15:09:34 UTC (rev 205078)
+++ trunk/LayoutTests/imported/w3c/ChangeLog        2016-08-27 17:45:12 UTC (rev 205079)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-27 Andreas Kling <akling@apple.com>
+
+ script.text should behave like script.textContent on setting
+ <https://webkit.org/b/148852>
+
+ Reviewed by Chris Dumez.
+
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt:
+
</ins><span class="cx"> 2016-08-27 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Sync web-platform-tests up to revision e827374
</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 (205078 => 205079)</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        2016-08-27 15:09:34 UTC (rev 205078)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text-expected.txt        2016-08-27 17:45:12 UTC (rev 205079)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx">
</span><span class="cx"> PASS Getter
</span><span class="cx"> PASS Setter (non-empty string)
</span><del>-FAIL Setter (empty string) assert_equals: expected null but got Text node ""
</del><ins>+PASS Setter (empty string)
</ins><span class="cx"> PASS Setter (null)
</span><span class="cx"> PASS Setter (undefined)
</span><del>-FAIL Setter (text node reuse) assert_not_equals: got disallowed value Text node "two"
</del><ins>+PASS Setter (text node reuse)
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205078 => 205079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-08-27 15:09:34 UTC (rev 205078)
+++ trunk/Source/WebCore/ChangeLog        2016-08-27 17:45:12 UTC (rev 205079)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-27 Andreas Kling <akling@apple.com>
+
+ script.text should behave like script.textContent on setting
+ <https://webkit.org/b/148852>
+
+ Reviewed by Chris Dumez.
+
+ HTMLScriptElement.text should behave just like .textContent when setting,
+ so just forward setText() to setTextContent().
+
+ Test: import/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-text.html
+
+ * html/HTMLScriptElement.cpp:
+ (WebCore::HTMLScriptElement::setText):
+
</ins><span class="cx"> 2016-08-27 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Blob type should be set from Response/Request contentType header
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLScriptElement.cpp (205078 => 205079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLScriptElement.cpp        2016-08-27 15:09:34 UTC (rev 205078)
+++ trunk/Source/WebCore/html/HTMLScriptElement.cpp        2016-08-27 17:45:12 UTC (rev 205079)
</span><span class="lines">@@ -79,19 +79,10 @@
</span><span class="cx"> ScriptElement::finishedInsertingSubtree();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// https://html.spec.whatwg.org/multipage/scripting.html#dom-script-text
</ins><span class="cx"> void HTMLScriptElement::setText(const String& value)
</span><span class="cx"> {
</span><del>- Ref<HTMLScriptElement> protectedThis(*this);
-
- if (hasOneChild() && is<Text>(*firstChild())) {
- downcast<Text>(*firstChild()).setData(value);
- return;
- }
-
- if (hasChildNodes())
- removeChildren();
-
- appendChild(document().createTextNode(value), IGNORE_EXCEPTION);
</del><ins>+ setTextContent(value, ASSERT_NO_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLScriptElement::setAsync(bool async)
</span></span></pre>
</div>
</div>
</body>
</html>