<!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>[214136] 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/214136">214136</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-03-18 12:51:48 -0700 (Sat, 18 Mar 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>innerText setter inserts empty text node if value starts with newline
https://bugs.webkit.org/show_bug.cgi?id=169600

Reviewed by Ryosuke Niwa.

LayoutTests/imported/w3c:

Re-sync tests with upstream to gain test coverage.

* web-platform-tests/innerText/getter-expected.txt:
* web-platform-tests/innerText/getter-tests.js:
* web-platform-tests/innerText/setter-expected.txt:
* web-platform-tests/innerText/setter-tests.js:
* web-platform-tests/innerText/setter.html:

Source/WebCore:

innerText setter should not create empty text nodes as per:
- https://html.spec.whatwg.org/multipage/dom.html#the-innertext-idl-attribute (step 6.2)

No new tests, updated existing test.

* html/HTMLElement.cpp:
(WebCore::textToFragment):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsinnerTextgetterexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsinnerTextgettertestsjs">trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-tests.js</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsinnerTextsetterexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsinnerTextsettertestsjs">trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-tests.js</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsinnerTextsetterhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.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 (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/LayoutTests/imported/w3c/ChangeLog        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-03-18  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        innerText setter inserts empty text node if value starts with newline
+        https://bugs.webkit.org/show_bug.cgi?id=169600
+
+        Reviewed by Ryosuke Niwa.
+
+        Re-sync tests with upstream to gain test coverage.
+
+        * web-platform-tests/innerText/getter-expected.txt:
+        * web-platform-tests/innerText/getter-tests.js:
+        * web-platform-tests/innerText/setter-expected.txt:
+        * web-platform-tests/innerText/setter-tests.js:
+        * web-platform-tests/innerText/setter.html:
+
+2017-03-18  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Allow setting the prototype of cross-origin objects, as long as they don't change
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=169787
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsinnerTextgetterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-expected.txt (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-expected.txt        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-expected.txt        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> PASS \n preserved (&quot;&lt;pre&gt;abc\ndef&quot;) 
</span><span class="cx"> PASS \r converted to newline (&quot;&lt;pre&gt;abc\rdef&quot;) 
</span><span class="cx"> PASS \t preserved (&quot;&lt;pre&gt;abc\tdef&quot;) 
</span><ins>+FAIL Two &lt;pre&gt; siblings (&quot;&lt;div&gt;&lt;pre&gt;abc&lt;/pre&gt;&lt;pre&gt;def&lt;/pre&gt;&quot;) assert_equals: expected &quot;abc\ndef&quot; but got &quot;abc\ndef\n&quot;
</ins><span class="cx"> PASS Leading whitespace preserved (&quot;&lt;div style='white-space:pre'&gt; abc&quot;) 
</span><span class="cx"> PASS Trailing whitespace preserved (&quot;&lt;div style='white-space:pre'&gt;abc &quot;) 
</span><span class="cx"> PASS Internal whitespace preserved (&quot;&lt;div style='white-space:pre'&gt;abc  def&quot;) 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsinnerTextgettertestsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-tests.js (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-tests.js        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/getter-tests.js        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> testText(&quot;&lt;pre&gt;abc\ndef&quot;, &quot;abc\ndef&quot;, &quot;\\n preserved&quot;);
</span><span class="cx"> testText(&quot;&lt;pre&gt;abc\rdef&quot;, &quot;abc\ndef&quot;, &quot;\\r converted to newline&quot;);
</span><span class="cx"> testText(&quot;&lt;pre&gt;abc\tdef&quot;, &quot;abc\tdef&quot;, &quot;\\t preserved&quot;);
</span><ins>+testText(&quot;&lt;div&gt;&lt;pre&gt;abc&lt;/pre&gt;&lt;pre&gt;def&lt;/pre&gt;&quot;, &quot;abc\ndef&quot;, &quot;Two &lt;pre&gt; siblings&quot;);
</ins><span class="cx"> 
</span><span class="cx"> /**** &lt;div style=&quot;white-space:pre&quot;&gt; ****/
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsinnerTextsetterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-expected.txt (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-expected.txt        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-expected.txt        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -27,6 +27,12 @@
</span><span class="cx"> PASS Assigning the empty string 
</span><span class="cx"> PASS Assigning null 
</span><span class="cx"> PASS Assigning undefined 
</span><ins>+PASS Start with CR 
+PASS Start with LF 
+PASS Start with CRLF 
+PASS End with CR 
+PASS End with LF 
+PASS End with CRLF 
</ins><span class="cx"> PASS innerText on &lt;area&gt; element 
</span><span class="cx"> PASS innerText on &lt;base&gt; element 
</span><span class="cx"> PASS innerText on &lt;basefont&gt; element 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsinnerTextsettertestsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-tests.js (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-tests.js        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter-tests.js        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -25,6 +25,12 @@
</span><span class="cx"> testHTML(&quot;&lt;div&gt;&quot;, &quot;&quot;, &quot;&quot;, &quot;Assigning the empty string&quot;);
</span><span class="cx"> testHTML(&quot;&lt;div&gt;&quot;, null, &quot;&quot;, &quot;Assigning null&quot;);
</span><span class="cx"> testHTML(&quot;&lt;div&gt;&quot;, undefined, &quot;undefined&quot;, &quot;Assigning undefined&quot;);
</span><ins>+testHTML(&quot;&lt;div&gt;&quot;, &quot;\rabc&quot;, &quot;&lt;br&gt;abc&quot;, &quot;Start with CR&quot;);
+testHTML(&quot;&lt;div&gt;&quot;, &quot;\nabc&quot;, &quot;&lt;br&gt;abc&quot;, &quot;Start with LF&quot;);
+testHTML(&quot;&lt;div&gt;&quot;, &quot;\r\nabc&quot;, &quot;&lt;br&gt;abc&quot;, &quot;Start with CRLF&quot;);
+testHTML(&quot;&lt;div&gt;&quot;, &quot;abc\r&quot;, &quot;abc&lt;br&gt;&quot;, &quot;End with CR&quot;);
+testHTML(&quot;&lt;div&gt;&quot;, &quot;abc\n&quot;, &quot;abc&lt;br&gt;&quot;, &quot;End with LF&quot;);
+testHTML(&quot;&lt;div&gt;&quot;, &quot;abc\r\n&quot;, &quot;abc&lt;br&gt;&quot;, &quot;End with CRLF&quot;);
</ins><span class="cx"> 
</span><span class="cx"> // Setting innerText on these should not throw
</span><span class="cx"> [&quot;area&quot;, &quot;base&quot;, &quot;basefont&quot;, &quot;bgsound&quot;, &quot;br&quot;, &quot;col&quot;, &quot;embed&quot;, &quot;frame&quot;, &quot;hr&quot;,
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsinnerTextsetterhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter.html (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter.html        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/innerText/setter.html        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -36,6 +36,13 @@
</span><span class="cx">   test(function(){
</span><span class="cx">     var e = setupTest(context, plain)[0];
</span><span class="cx">     assert_equals(e.innerHTML, expectedHTML);
</span><ins>+    var child = e.firstChild;
+    while (child) {
+      if (child.nodeType === Node.TEXT_NODE) {
+        assert_not_equals(child.data, &quot;&quot;, &quot;Should not have empty text nodes&quot;);
+      }
+      child = child.nextSibling;
+    }
</ins><span class="cx">   }, msg);
</span><span class="cx"> }
</span><span class="cx"> &lt;/script&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/Source/WebCore/ChangeLog        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-03-18  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        innerText setter inserts empty text node if value starts with newline
+        https://bugs.webkit.org/show_bug.cgi?id=169600
+
+        Reviewed by Ryosuke Niwa.
+
+        innerText setter should not create empty text nodes as per:
+        - https://html.spec.whatwg.org/multipage/dom.html#the-innertext-idl-attribute (step 6.2)
+
+        No new tests, updated existing test.
+
+        * html/HTMLElement.cpp:
+        (WebCore::textToFragment):
+
+2017-03-18  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Allow setting the prototype of cross-origin objects, as long as they don't change
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=169787
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (214135 => 214136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp        2017-03-18 17:52:01 UTC (rev 214135)
+++ trunk/Source/WebCore/html/HTMLElement.cpp        2017-03-18 19:51:48 UTC (rev 214136)
</span><span class="lines">@@ -451,7 +451,10 @@
</span><span class="cx">                 break;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        fragment-&gt;appendChild(Text::create(document, text.substring(start, i - start)));
</del><ins>+        // If text is not the empty string, then append a new Text node whose data is text and node document is document to fragment.
+        if (i &gt; start)
+            fragment-&gt;appendChild(Text::create(document, text.substring(start, i - start)));
+
</ins><span class="cx">         if (i == length)
</span><span class="cx">             break;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>