<!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>[206246] 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/206246">206246</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-21 21:36:22 -0700 (Wed, 21 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix serialization of bgsound, keygen and track elements
https://bugs.webkit.org/show_bug.cgi?id=162353
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
Rebaseline W3C tests now that more checks are passing.
* web-platform-tests/html/syntax/serializing-html-fragments/outerHTML-expected.txt:
* web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt:
* web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML-expected.txt:
Source/WebCore:
Fix serialization of keygen and track elements to match the specification:
- https://html.spec.whatwg.org/#serialising-html-fragments
They are not supposed to have an end tag. Firefox and Chrome agree with
the specification.
No new tests, rebaselined existing tests.
* editing/MarkupAccumulator.cpp:
(WebCore::MarkupAccumulator::elementCannotHaveEndTag):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsyntaxserializinghtmlfragmentsouterHTMLexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/outerHTML-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsyntaxserializinghtmlfragmentsserializingexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsyntaxserializingxmlfragmentsouterHTMLexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorcpp">trunk/Source/WebCore/editing/MarkupAccumulator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthtmlimageelementserializationexpectedtxt">trunk/LayoutTests/fast/html/image-element-serialization-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthtmlimageelementserializationhtml">trunk/LayoutTests/fast/html/image-element-serialization.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsfasthtmlimageelementserializationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/html/image-element-serialization-expected.txt (0 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/image-element-serialization-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/html/image-element-serialization-expected.txt 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Test that an element in HTML has an end tag when serialized.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS image.__proto__ is HTMLUnknownElement.prototype
+PASS div.innerHTML is "<image></image>"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthtmlimageelementserializationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/html/image-element-serialization.html (0 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/image-element-serialization.html (rev 0)
+++ trunk/LayoutTests/fast/html/image-element-serialization.html 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Test that an <image> element in HTML has an end tag when serialized.");
+
+var div = document.createElement("div");
+var image = document.createElement("image");
+shouldBe("image.__proto__", "HTMLUnknownElement.prototype");
+div.appendChild(image);
+shouldBeEqualToString("div.innerHTML", "<image></image>");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (206245 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-22 04:32:12 UTC (rev 206245)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-09-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Fix serialization of bgsound, keygen and track elements
+ https://bugs.webkit.org/show_bug.cgi?id=162353
+
+ Reviewed by Darin Adler.
+
+ Rebaseline W3C tests now that more checks are passing.
+
+ * web-platform-tests/html/syntax/serializing-html-fragments/outerHTML-expected.txt:
+ * web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt:
+ * web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML-expected.txt:
+
+2016-09-21 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Setting HTMLMeterElement's attributes to non-finite values throws wrong exception type
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162364
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsyntaxserializinghtmlfragmentsouterHTMLexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/outerHTML-expected.txt (206245 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/outerHTML-expected.txt 2016-09-22 04:32:12 UTC (rev 206245)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/outerHTML-expected.txt 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -103,11 +103,11 @@
</span><span class="cx"> PASS Node for hr
</span><span class="cx"> PASS Node for img
</span><span class="cx"> PASS Node for input
</span><del>-FAIL Node for keygen assert_equals: keygen node created. expected "<keygen>" but got "<keygen></keygen>"
</del><ins>+PASS Node for keygen
</ins><span class="cx"> PASS Node for link
</span><span class="cx"> PASS Node for meta
</span><span class="cx"> PASS Node for param
</span><span class="cx"> PASS Node for source
</span><del>-FAIL Node for track assert_equals: track node created. expected "<track>" but got "<track></track>"
</del><ins>+PASS Node for track
</ins><span class="cx"> PASS Node for wbr
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsyntaxserializinghtmlfragmentsserializingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt (206245 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt 2016-09-22 04:32:12 UTC (rev 206245)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> PASS innerHTML Void context node area
</span><span class="cx"> PASS innerHTML Void context node base
</span><span class="cx"> PASS innerHTML Void context node basefont
</span><del>-FAIL innerHTML Void context node bgsound assert_equals: expected "" but got "<a><!--abc--></a><b><c>abc</c></b>"
</del><ins>+PASS innerHTML Void context node bgsound
</ins><span class="cx"> PASS innerHTML Void context node br
</span><span class="cx"> PASS innerHTML Void context node col
</span><span class="cx"> PASS innerHTML Void context node embed
</span><span class="lines">@@ -100,18 +100,18 @@
</span><span class="cx"> PASS innerHTML Void context node hr
</span><span class="cx"> PASS innerHTML Void context node img
</span><span class="cx"> PASS innerHTML Void context node input
</span><del>-FAIL innerHTML Void context node keygen assert_equals: expected "" but got "<a><!--abc--></a><b><c>abc</c></b>"
</del><ins>+PASS innerHTML Void context node keygen
</ins><span class="cx"> PASS innerHTML Void context node link
</span><span class="cx"> FAIL innerHTML Void context node menuitem assert_equals: expected "" but got "<a><!--abc--></a><b><c>abc</c></b>"
</span><span class="cx"> PASS innerHTML Void context node meta
</span><span class="cx"> PASS innerHTML Void context node param
</span><span class="cx"> PASS innerHTML Void context node source
</span><del>-FAIL innerHTML Void context node track assert_equals: expected "" but got "<a><!--abc--></a><b><c>abc</c></b>"
</del><ins>+PASS innerHTML Void context node track
</ins><span class="cx"> PASS innerHTML Void context node wbr
</span><span class="cx"> FAIL innerHTML void as first child with following siblings area assert_equals: expected "<area><a>test</a><b></b>" but got "<area></area><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings base assert_equals: expected "<base><a>test</a><b></b>" but got "<base></base><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings basefont assert_equals: expected "<basefont><a>test</a><b></b>" but got "<basefont></basefont><a>test</a><b></b>"
</span><del>-FAIL innerHTML void as first child with following siblings bgsound assert_equals: expected "<bgsound><a>test</a><b></b>" but got "<bgsound><a><!--abc--></a><b><c>abc</c></b></bgsound><a>test</a><b></b>"
</del><ins>+FAIL innerHTML void as first child with following siblings bgsound assert_equals: expected "<bgsound><a>test</a><b></b>" but got "<bgsound></bgsound><a>test</a><b></b>"
</ins><span class="cx"> FAIL innerHTML void as first child with following siblings br assert_equals: expected "<br><a>test</a><b></b>" but got "<br></br><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings col assert_equals: expected "<col><a>test</a><b></b>" but got "<col></col><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings embed assert_equals: expected "<embed><a>test</a><b></b>" but got "<embed></embed><a>test</a><b></b>"
</span><span class="lines">@@ -119,18 +119,18 @@
</span><span class="cx"> FAIL innerHTML void as first child with following siblings hr assert_equals: expected "<hr><a>test</a><b></b>" but got "<hr></hr><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings img assert_equals: expected "<img><a>test</a><b></b>" but got "<img></img><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings input assert_equals: expected "<input><a>test</a><b></b>" but got "<input></input><a>test</a><b></b>"
</span><del>-FAIL innerHTML void as first child with following siblings keygen assert_equals: expected "<keygen><a>test</a><b></b>" but got "<keygen><a><!--abc--></a><b><c>abc</c></b></keygen><a>test</a><b></b>"
</del><ins>+FAIL innerHTML void as first child with following siblings keygen assert_equals: expected "<keygen><a>test</a><b></b>" but got "<keygen></keygen><a>test</a><b></b>"
</ins><span class="cx"> FAIL innerHTML void as first child with following siblings link assert_equals: expected "<link><a>test</a><b></b>" but got "<link></link><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings menuitem assert_equals: expected "<menuitem><a>test</a><b></b>" but got "<menuitem><a><!--abc--></a><b><c>abc</c></b></menuitem><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings meta assert_equals: expected "<meta><a>test</a><b></b>" but got "<meta></meta><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings param assert_equals: expected "<param><a>test</a><b></b>" but got "<param></param><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as first child with following siblings source assert_equals: expected "<source><a>test</a><b></b>" but got "<source></source><a>test</a><b></b>"
</span><del>-FAIL innerHTML void as first child with following siblings track assert_equals: expected "<track><a>test</a><b></b>" but got "<track><a><!--abc--></a><b><c>abc</c></b></track><a>test</a><b></b>"
</del><ins>+FAIL innerHTML void as first child with following siblings track assert_equals: expected "<track><a>test</a><b></b>" but got "<track></track><a>test</a><b></b>"
</ins><span class="cx"> FAIL innerHTML void as first child with following siblings wbr assert_equals: expected "<wbr><a>test</a><b></b>" but got "<wbr></wbr><a>test</a><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings area assert_equals: expected "<a>test</a><area><b></b>" but got "<a>test</a><area></area><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings base assert_equals: expected "<a>test</a><base><b></b>" but got "<a>test</a><base></base><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings basefont assert_equals: expected "<a>test</a><basefont><b></b>" but got "<a>test</a><basefont></basefont><b></b>"
</span><del>-FAIL innerHTML void as second child with following siblings bgsound assert_equals: expected "<a>test</a><bgsound><b></b>" but got "<a>test</a><bgsound><a><!--abc--></a><b><c>abc</c></b></bgsound><b></b>"
</del><ins>+FAIL innerHTML void as second child with following siblings bgsound assert_equals: expected "<a>test</a><bgsound><b></b>" but got "<a>test</a><bgsound></bgsound><b></b>"
</ins><span class="cx"> FAIL innerHTML void as second child with following siblings br assert_equals: expected "<a>test</a><br><b></b>" but got "<a>test</a><br></br><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings col assert_equals: expected "<a>test</a><col><b></b>" but got "<a>test</a><col></col><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings embed assert_equals: expected "<a>test</a><embed><b></b>" but got "<a>test</a><embed></embed><b></b>"
</span><span class="lines">@@ -138,18 +138,18 @@
</span><span class="cx"> FAIL innerHTML void as second child with following siblings hr assert_equals: expected "<a>test</a><hr><b></b>" but got "<a>test</a><hr></hr><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings img assert_equals: expected "<a>test</a><img><b></b>" but got "<a>test</a><img></img><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings input assert_equals: expected "<a>test</a><input><b></b>" but got "<a>test</a><input></input><b></b>"
</span><del>-FAIL innerHTML void as second child with following siblings keygen assert_equals: expected "<a>test</a><keygen><b></b>" but got "<a>test</a><keygen><a><!--abc--></a><b><c>abc</c></b></keygen><b></b>"
</del><ins>+FAIL innerHTML void as second child with following siblings keygen assert_equals: expected "<a>test</a><keygen><b></b>" but got "<a>test</a><keygen></keygen><b></b>"
</ins><span class="cx"> FAIL innerHTML void as second child with following siblings link assert_equals: expected "<a>test</a><link><b></b>" but got "<a>test</a><link></link><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings menuitem assert_equals: expected "<a>test</a><menuitem><b></b>" but got "<a>test</a><menuitem><a><!--abc--></a><b><c>abc</c></b></menuitem><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings meta assert_equals: expected "<a>test</a><meta><b></b>" but got "<a>test</a><meta></meta><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings param assert_equals: expected "<a>test</a><param><b></b>" but got "<a>test</a><param></param><b></b>"
</span><span class="cx"> FAIL innerHTML void as second child with following siblings source assert_equals: expected "<a>test</a><source><b></b>" but got "<a>test</a><source></source><b></b>"
</span><del>-FAIL innerHTML void as second child with following siblings track assert_equals: expected "<a>test</a><track><b></b>" but got "<a>test</a><track><a><!--abc--></a><b><c>abc</c></b></track><b></b>"
</del><ins>+FAIL innerHTML void as second child with following siblings track assert_equals: expected "<a>test</a><track><b></b>" but got "<a>test</a><track></track><b></b>"
</ins><span class="cx"> FAIL innerHTML void as second child with following siblings wbr assert_equals: expected "<a>test</a><wbr><b></b>" but got "<a>test</a><wbr></wbr><b></b>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings area assert_equals: expected "<a>test</a><b></b><area>" but got "<a>test</a><b></b><area></area>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings base assert_equals: expected "<a>test</a><b></b><base>" but got "<a>test</a><b></b><base></base>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings basefont assert_equals: expected "<a>test</a><b></b><basefont>" but got "<a>test</a><b></b><basefont></basefont>"
</span><del>-FAIL innerHTML void as last child with preceding siblings bgsound assert_equals: expected "<a>test</a><b></b><bgsound>" but got "<a>test</a><b></b><bgsound><a><!--abc--></a><b><c>abc</c></b></bgsound>"
</del><ins>+FAIL innerHTML void as last child with preceding siblings bgsound assert_equals: expected "<a>test</a><b></b><bgsound>" but got "<a>test</a><b></b><bgsound></bgsound>"
</ins><span class="cx"> FAIL innerHTML void as last child with preceding siblings br assert_equals: expected "<a>test</a><b></b><br>" but got "<a>test</a><b></b><br></br>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings col assert_equals: expected "<a>test</a><b></b><col>" but got "<a>test</a><b></b><col></col>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings embed assert_equals: expected "<a>test</a><b></b><embed>" but got "<a>test</a><b></b><embed></embed>"
</span><span class="lines">@@ -157,18 +157,18 @@
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings hr assert_equals: expected "<a>test</a><b></b><hr>" but got "<a>test</a><b></b><hr></hr>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings img assert_equals: expected "<a>test</a><b></b><img>" but got "<a>test</a><b></b><img></img>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings input assert_equals: expected "<a>test</a><b></b><input>" but got "<a>test</a><b></b><input></input>"
</span><del>-FAIL innerHTML void as last child with preceding siblings keygen assert_equals: expected "<a>test</a><b></b><keygen>" but got "<a>test</a><b></b><keygen><a><!--abc--></a><b><c>abc</c></b></keygen>"
</del><ins>+FAIL innerHTML void as last child with preceding siblings keygen assert_equals: expected "<a>test</a><b></b><keygen>" but got "<a>test</a><b></b><keygen></keygen>"
</ins><span class="cx"> FAIL innerHTML void as last child with preceding siblings link assert_equals: expected "<a>test</a><b></b><link>" but got "<a>test</a><b></b><link></link>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings menuitem assert_equals: expected "<a>test</a><b></b><menuitem>" but got "<a>test</a><b></b><menuitem><a><!--abc--></a><b><c>abc</c></b></menuitem>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings meta assert_equals: expected "<a>test</a><b></b><meta>" but got "<a>test</a><b></b><meta></meta>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings param assert_equals: expected "<a>test</a><b></b><param>" but got "<a>test</a><b></b><param></param>"
</span><span class="cx"> FAIL innerHTML void as last child with preceding siblings source assert_equals: expected "<a>test</a><b></b><source>" but got "<a>test</a><b></b><source></source>"
</span><del>-FAIL innerHTML void as last child with preceding siblings track assert_equals: expected "<a>test</a><b></b><track>" but got "<a>test</a><b></b><track><a><!--abc--></a><b><c>abc</c></b></track>"
</del><ins>+FAIL innerHTML void as last child with preceding siblings track assert_equals: expected "<a>test</a><b></b><track>" but got "<a>test</a><b></b><track></track>"
</ins><span class="cx"> FAIL innerHTML void as last child with preceding siblings wbr assert_equals: expected "<a>test</a><b></b><wbr>" but got "<a>test</a><b></b><wbr></wbr>"
</span><span class="cx"> FAIL outerHTML Void context node area assert_equals: expected "<area>" but got "<area></area>"
</span><span class="cx"> FAIL outerHTML Void context node base assert_equals: expected "<base>" but got "<base></base>"
</span><span class="cx"> FAIL outerHTML Void context node basefont assert_equals: expected "<basefont>" but got "<basefont></basefont>"
</span><del>-FAIL outerHTML Void context node bgsound assert_equals: expected "<bgsound>" but got "<bgsound><a><!--abc--></a><b><c>abc</c></b></bgsound>"
</del><ins>+FAIL outerHTML Void context node bgsound assert_equals: expected "<bgsound>" but got "<bgsound></bgsound>"
</ins><span class="cx"> FAIL outerHTML Void context node br assert_equals: expected "<br>" but got "<br></br>"
</span><span class="cx"> FAIL outerHTML Void context node col assert_equals: expected "<col>" but got "<col></col>"
</span><span class="cx"> FAIL outerHTML Void context node embed assert_equals: expected "<embed>" but got "<embed></embed>"
</span><span class="lines">@@ -176,18 +176,18 @@
</span><span class="cx"> FAIL outerHTML Void context node hr assert_equals: expected "<hr>" but got "<hr></hr>"
</span><span class="cx"> FAIL outerHTML Void context node img assert_equals: expected "<img>" but got "<img></img>"
</span><span class="cx"> FAIL outerHTML Void context node input assert_equals: expected "<input>" but got "<input></input>"
</span><del>-FAIL outerHTML Void context node keygen assert_equals: expected "<keygen>" but got "<keygen><a><!--abc--></a><b><c>abc</c></b></keygen>"
</del><ins>+FAIL outerHTML Void context node keygen assert_equals: expected "<keygen>" but got "<keygen></keygen>"
</ins><span class="cx"> FAIL outerHTML Void context node link assert_equals: expected "<link>" but got "<link></link>"
</span><span class="cx"> FAIL outerHTML Void context node menuitem assert_equals: expected "<menuitem>" but got "<menuitem><a><!--abc--></a><b><c>abc</c></b></menuitem>"
</span><span class="cx"> FAIL outerHTML Void context node meta assert_equals: expected "<meta>" but got "<meta></meta>"
</span><span class="cx"> FAIL outerHTML Void context node param assert_equals: expected "<param>" but got "<param></param>"
</span><span class="cx"> FAIL outerHTML Void context node source assert_equals: expected "<source>" but got "<source></source>"
</span><del>-FAIL outerHTML Void context node track assert_equals: expected "<track>" but got "<track><a><!--abc--></a><b><c>abc</c></b></track>"
</del><ins>+FAIL outerHTML Void context node track assert_equals: expected "<track>" but got "<track></track>"
</ins><span class="cx"> FAIL outerHTML Void context node wbr assert_equals: expected "<wbr>" but got "<wbr></wbr>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings area assert_equals: expected "<span><area><a>test</a><b></b></span>" but got "<span><area></area><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings base assert_equals: expected "<span><base><a>test</a><b></b></span>" but got "<span><base></base><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings basefont assert_equals: expected "<span><basefont><a>test</a><b></b></span>" but got "<span><basefont></basefont><a>test</a><b></b></span>"
</span><del>-FAIL outerHTML void as first child with following siblings bgsound assert_equals: expected "<span><bgsound><a>test</a><b></b></span>" but got "<span><bgsound><a><!--abc--></a><b><c>abc</c></b></bgsound><a>test</a><b></b></span>"
</del><ins>+FAIL outerHTML void as first child with following siblings bgsound assert_equals: expected "<span><bgsound><a>test</a><b></b></span>" but got "<span><bgsound></bgsound><a>test</a><b></b></span>"
</ins><span class="cx"> FAIL outerHTML void as first child with following siblings br assert_equals: expected "<span><br><a>test</a><b></b></span>" but got "<span><br></br><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings col assert_equals: expected "<span><col><a>test</a><b></b></span>" but got "<span><col></col><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings embed assert_equals: expected "<span><embed><a>test</a><b></b></span>" but got "<span><embed></embed><a>test</a><b></b></span>"
</span><span class="lines">@@ -195,18 +195,18 @@
</span><span class="cx"> FAIL outerHTML void as first child with following siblings hr assert_equals: expected "<span><hr><a>test</a><b></b></span>" but got "<span><hr></hr><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings img assert_equals: expected "<span><img><a>test</a><b></b></span>" but got "<span><img></img><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings input assert_equals: expected "<span><input><a>test</a><b></b></span>" but got "<span><input></input><a>test</a><b></b></span>"
</span><del>-FAIL outerHTML void as first child with following siblings keygen assert_equals: expected "<span><keygen><a>test</a><b></b></span>" but got "<span><keygen><a><!--abc--></a><b><c>abc</c></b></keygen><a>test</a><b></b></span>"
</del><ins>+FAIL outerHTML void as first child with following siblings keygen assert_equals: expected "<span><keygen><a>test</a><b></b></span>" but got "<span><keygen></keygen><a>test</a><b></b></span>"
</ins><span class="cx"> FAIL outerHTML void as first child with following siblings link assert_equals: expected "<span><link><a>test</a><b></b></span>" but got "<span><link></link><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings menuitem assert_equals: expected "<span><menuitem><a>test</a><b></b></span>" but got "<span><menuitem><a><!--abc--></a><b><c>abc</c></b></menuitem><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings meta assert_equals: expected "<span><meta><a>test</a><b></b></span>" but got "<span><meta></meta><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings param assert_equals: expected "<span><param><a>test</a><b></b></span>" but got "<span><param></param><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as first child with following siblings source assert_equals: expected "<span><source><a>test</a><b></b></span>" but got "<span><source></source><a>test</a><b></b></span>"
</span><del>-FAIL outerHTML void as first child with following siblings track assert_equals: expected "<span><track><a>test</a><b></b></span>" but got "<span><track><a><!--abc--></a><b><c>abc</c></b></track><a>test</a><b></b></span>"
</del><ins>+FAIL outerHTML void as first child with following siblings track assert_equals: expected "<span><track><a>test</a><b></b></span>" but got "<span><track></track><a>test</a><b></b></span>"
</ins><span class="cx"> FAIL outerHTML void as first child with following siblings wbr assert_equals: expected "<span><wbr><a>test</a><b></b></span>" but got "<span><wbr></wbr><a>test</a><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings area assert_equals: expected "<span><a>test</a><area><b></b></span>" but got "<span><a>test</a><area></area><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings base assert_equals: expected "<span><a>test</a><base><b></b></span>" but got "<span><a>test</a><base></base><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings basefont assert_equals: expected "<span><a>test</a><basefont><b></b></span>" but got "<span><a>test</a><basefont></basefont><b></b></span>"
</span><del>-FAIL outerHTML void as second child with following siblings bgsound assert_equals: expected "<span><a>test</a><bgsound><b></b></span>" but got "<span><a>test</a><bgsound><a><!--abc--></a><b><c>abc</c></b></bgsound><b></b></span>"
</del><ins>+FAIL outerHTML void as second child with following siblings bgsound assert_equals: expected "<span><a>test</a><bgsound><b></b></span>" but got "<span><a>test</a><bgsound></bgsound><b></b></span>"
</ins><span class="cx"> FAIL outerHTML void as second child with following siblings br assert_equals: expected "<span><a>test</a><br><b></b></span>" but got "<span><a>test</a><br></br><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings col assert_equals: expected "<span><a>test</a><col><b></b></span>" but got "<span><a>test</a><col></col><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings embed assert_equals: expected "<span><a>test</a><embed><b></b></span>" but got "<span><a>test</a><embed></embed><b></b></span>"
</span><span class="lines">@@ -214,18 +214,18 @@
</span><span class="cx"> FAIL outerHTML void as second child with following siblings hr assert_equals: expected "<span><a>test</a><hr><b></b></span>" but got "<span><a>test</a><hr></hr><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings img assert_equals: expected "<span><a>test</a><img><b></b></span>" but got "<span><a>test</a><img></img><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings input assert_equals: expected "<span><a>test</a><input><b></b></span>" but got "<span><a>test</a><input></input><b></b></span>"
</span><del>-FAIL outerHTML void as second child with following siblings keygen assert_equals: expected "<span><a>test</a><keygen><b></b></span>" but got "<span><a>test</a><keygen><a><!--abc--></a><b><c>abc</c></b></keygen><b></b></span>"
</del><ins>+FAIL outerHTML void as second child with following siblings keygen assert_equals: expected "<span><a>test</a><keygen><b></b></span>" but got "<span><a>test</a><keygen></keygen><b></b></span>"
</ins><span class="cx"> FAIL outerHTML void as second child with following siblings link assert_equals: expected "<span><a>test</a><link><b></b></span>" but got "<span><a>test</a><link></link><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings menuitem assert_equals: expected "<span><a>test</a><menuitem><b></b></span>" but got "<span><a>test</a><menuitem><a><!--abc--></a><b><c>abc</c></b></menuitem><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings meta assert_equals: expected "<span><a>test</a><meta><b></b></span>" but got "<span><a>test</a><meta></meta><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings param assert_equals: expected "<span><a>test</a><param><b></b></span>" but got "<span><a>test</a><param></param><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as second child with following siblings source assert_equals: expected "<span><a>test</a><source><b></b></span>" but got "<span><a>test</a><source></source><b></b></span>"
</span><del>-FAIL outerHTML void as second child with following siblings track assert_equals: expected "<span><a>test</a><track><b></b></span>" but got "<span><a>test</a><track><a><!--abc--></a><b><c>abc</c></b></track><b></b></span>"
</del><ins>+FAIL outerHTML void as second child with following siblings track assert_equals: expected "<span><a>test</a><track><b></b></span>" but got "<span><a>test</a><track></track><b></b></span>"
</ins><span class="cx"> FAIL outerHTML void as second child with following siblings wbr assert_equals: expected "<span><a>test</a><wbr><b></b></span>" but got "<span><a>test</a><wbr></wbr><b></b></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings area assert_equals: expected "<span><a>test</a><b></b><area></span>" but got "<span><a>test</a><b></b><area></area></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings base assert_equals: expected "<span><a>test</a><b></b><base></span>" but got "<span><a>test</a><b></b><base></base></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings basefont assert_equals: expected "<span><a>test</a><b></b><basefont></span>" but got "<span><a>test</a><b></b><basefont></basefont></span>"
</span><del>-FAIL outerHTML void as last child with preceding siblings bgsound assert_equals: expected "<span><a>test</a><b></b><bgsound></span>" but got "<span><a>test</a><b></b><bgsound><a><!--abc--></a><b><c>abc</c></b></bgsound></span>"
</del><ins>+FAIL outerHTML void as last child with preceding siblings bgsound assert_equals: expected "<span><a>test</a><b></b><bgsound></span>" but got "<span><a>test</a><b></b><bgsound></bgsound></span>"
</ins><span class="cx"> FAIL outerHTML void as last child with preceding siblings br assert_equals: expected "<span><a>test</a><b></b><br></span>" but got "<span><a>test</a><b></b><br></br></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings col assert_equals: expected "<span><a>test</a><b></b><col></span>" but got "<span><a>test</a><b></b><col></col></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings embed assert_equals: expected "<span><a>test</a><b></b><embed></span>" but got "<span><a>test</a><b></b><embed></embed></span>"
</span><span class="lines">@@ -233,12 +233,12 @@
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings hr assert_equals: expected "<span><a>test</a><b></b><hr></span>" but got "<span><a>test</a><b></b><hr></hr></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings img assert_equals: expected "<span><a>test</a><b></b><img></span>" but got "<span><a>test</a><b></b><img></img></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings input assert_equals: expected "<span><a>test</a><b></b><input></span>" but got "<span><a>test</a><b></b><input></input></span>"
</span><del>-FAIL outerHTML void as last child with preceding siblings keygen assert_equals: expected "<span><a>test</a><b></b><keygen></span>" but got "<span><a>test</a><b></b><keygen><a><!--abc--></a><b><c>abc</c></b></keygen></span>"
</del><ins>+FAIL outerHTML void as last child with preceding siblings keygen assert_equals: expected "<span><a>test</a><b></b><keygen></span>" but got "<span><a>test</a><b></b><keygen></keygen></span>"
</ins><span class="cx"> FAIL outerHTML void as last child with preceding siblings link assert_equals: expected "<span><a>test</a><b></b><link></span>" but got "<span><a>test</a><b></b><link></link></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings menuitem assert_equals: expected "<span><a>test</a><b></b><menuitem></span>" but got "<span><a>test</a><b></b><menuitem><a><!--abc--></a><b><c>abc</c></b></menuitem></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings meta assert_equals: expected "<span><a>test</a><b></b><meta></span>" but got "<span><a>test</a><b></b><meta></meta></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings param assert_equals: expected "<span><a>test</a><b></b><param></span>" but got "<span><a>test</a><b></b><param></param></span>"
</span><span class="cx"> FAIL outerHTML void as last child with preceding siblings source assert_equals: expected "<span><a>test</a><b></b><source></span>" but got "<span><a>test</a><b></b><source></source></span>"
</span><del>-FAIL outerHTML void as last child with preceding siblings track assert_equals: expected "<span><a>test</a><b></b><track></span>" but got "<span><a>test</a><b></b><track><a><!--abc--></a><b><c>abc</c></b></track></span>"
</del><ins>+FAIL outerHTML void as last child with preceding siblings track assert_equals: expected "<span><a>test</a><b></b><track></span>" but got "<span><a>test</a><b></b><track></track></span>"
</ins><span class="cx"> FAIL outerHTML void as last child with preceding siblings wbr assert_equals: expected "<span><a>test</a><b></b><wbr></span>" but got "<span><a>test</a><b></b><wbr></wbr></span>"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsyntaxserializingxmlfragmentsouterHTMLexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML-expected.txt (206245 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML-expected.txt 2016-09-22 04:32:12 UTC (rev 206245)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-xml-fragments/outerHTML-expected.txt 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -103,11 +103,11 @@
</span><span class="cx"> PASS Node for hr
</span><span class="cx"> PASS Node for img
</span><span class="cx"> PASS Node for input
</span><del>-FAIL Node for keygen assert_equals: keygen node created. expected "<keygen xmlns=\"http://www.w3.org/1999/xhtml\" />" but got "<keygen xmlns=\"http://www.w3.org/1999/xhtml\"></keygen>"
</del><ins>+PASS Node for keygen
</ins><span class="cx"> PASS Node for link
</span><span class="cx"> PASS Node for meta
</span><span class="cx"> PASS Node for param
</span><span class="cx"> PASS Node for source
</span><del>-FAIL Node for track assert_equals: track node created. expected "<track xmlns=\"http://www.w3.org/1999/xhtml\" />" but got "<track xmlns=\"http://www.w3.org/1999/xhtml\"></track>"
</del><ins>+PASS Node for track
</ins><span class="cx"> PASS Node for wbr
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206245 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-22 04:32:12 UTC (rev 206245)
+++ trunk/Source/WebCore/ChangeLog 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-21 Chris Dumez <cdumez@apple.com>
+
+ Fix serialization of bgsound, keygen and track elements
+ https://bugs.webkit.org/show_bug.cgi?id=162353
+
+ Reviewed by Darin Adler.
+
+ Fix serialization of keygen and track elements to match the specification:
+ - https://html.spec.whatwg.org/#serialising-html-fragments
+
+ They are not supposed to have an end tag. Firefox and Chrome agree with
+ the specification.
+
+ No new tests, rebaselined existing tests.
+
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::MarkupAccumulator::elementCannotHaveEndTag):
+
</ins><span class="cx"> 2016-09-21 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build for future versions of Clang.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (206245 => 206246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2016-09-22 04:32:12 UTC (rev 206245)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2016-09-22 04:36:22 UTC (rev 206246)
</span><span class="lines">@@ -590,11 +590,18 @@
</span><span class="cx"> if (!is<HTMLElement>(node))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // FIXME: ieForbidsInsertHTML may not be the right function to call here
- // ieForbidsInsertHTML is used to disallow setting innerHTML/outerHTML
- // or createContextualFragment. It does not necessarily align with
- // which elements should be serialized w/o end tags.
- return downcast<HTMLElement>(node).ieForbidsInsertHTML();
</del><ins>+ // From https://html.spec.whatwg.org/#serialising-html-fragments:
+ // If current node is an area, base, basefont, bgsound, br, col, embed, frame, hr, img,
+ // input, keygen, link, meta, param, source, track or wbr element, then continue on to
+ // the next child node at this point.
+ static const HTMLQualifiedName* tags[] = { &areaTag, &baseTag, &basefontTag, &bgsoundTag, &brTag, &colTag, &embedTag,
+ &frameTag, &hrTag, &imgTag, &inputTag, &keygenTag, &linkTag, &metaTag, &paramTag, &sourceTag, &trackTag, &wbrTag };
+ auto& element = downcast<HTMLElement>(node);
+ for (auto* tag : tags) {
+ if (element.hasTagName(*tag))
+ return true;
+ }
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MarkupAccumulator::appendEndMarkup(StringBuilder& result, const Element& element)
</span></span></pre>
</div>
</div>
</body>
</html>