<!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>[206240] 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/206240">206240</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-21 15:52:42 -0700 (Wed, 21 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix serialization of HTML Element attributes
https://bugs.webkit.org/show_bug.cgi?id=162356
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic-expected.txt:
* web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt:
Source/WebCore:
Fix serialization of HTML Element attributes to align with:
- https://html.spec.whatwg.org/#html-fragment-serialisation-algorithm
- https://html.spec.whatwg.org/#escapingString
In particular, we should not escape '<' and '>'.
Firefox and Chrome both match the specification.
Note that we keep escaping '<' and '>' for Element attributes in the
context of XML serialization, as per:
- https://w3c.github.io/DOM-Parsing/#dfn-serializing-an-attribute-value
No new tests, rebaselined existing test.
* editing/MarkupAccumulator.h:
LayoutTests:
Rebaseline test to reflect behavior change.
* editing/pasteboard/paste-noscript-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardpastenoscriptexpectedtxt">trunk/LayoutTests/editing/pasteboard/paste-noscript-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontenttheimgelementcurrentpixeldensitybasicexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic-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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorh">trunk/Source/WebCore/editing/MarkupAccumulator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206239 => 206240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-21 22:52:37 UTC (rev 206239)
+++ trunk/LayoutTests/ChangeLog 2016-09-21 22:52:42 UTC (rev 206240)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-21 Chris Dumez <cdumez@apple.com>
+
+ Fix serialization of HTML Element attributes
+ https://bugs.webkit.org/show_bug.cgi?id=162356
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline test to reflect behavior change.
+
+ * editing/pasteboard/paste-noscript-expected.txt:
+
</ins><span class="cx"> 2016-09-21 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Improve output of TestHarness.expect* failures
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpastenoscriptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/paste-noscript-expected.txt (206239 => 206240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-noscript-expected.txt 2016-09-21 22:52:37 UTC (rev 206239)
+++ trunk/LayoutTests/editing/pasteboard/paste-noscript-expected.txt 2016-09-21 22:52:42 UTC (rev 206240)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> <a id="anchor2">Hello</a>
</span><span class="cx"> <iframe id="iframe1" src="javascript:var x = 1;" style="width: 200px; height: 100px; background-color:#cee;"></iframe>
</span><span class="cx"> <iframe id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238);"></iframe>
</span><del>-<iframe id="iframe2" srcdoc="&lt;script&gt;var x = 1;&lt;/script&gt;" style="width: 200px; height: 100px; background-color:#cee;"></iframe>
</del><ins>+<iframe id="iframe2" srcdoc="<script>var x = 1;</script>" style="width: 200px; height: 100px; background-color:#cee;"></iframe>
</ins><span class="cx"> <iframe id="iframe2" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238);"></iframe>
</span><span class="cx"> <form id="form1" action="javascript:sayHello()" formaction="javascript:sayHello()" style="width: 200px; height: 150px; background-color:#cee;">This is a form<br><img src="../resources/abe.png"><button formaction="javascript:sayHello()">Submit.</button></form>
</span><span class="cx"> <form id="form1" formaction="javascript:sayHello()" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238);">This is a form<br><img src="../resources/abe.png"><button>Submit.</button></form>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (206239 => 206240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-21 22:52:37 UTC (rev 206239)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-21 22:52:42 UTC (rev 206240)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-09-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Fix serialization of HTML Element attributes
+ https://bugs.webkit.org/show_bug.cgi?id=162356
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic-expected.txt:
+ * web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt:
+
+2016-09-21 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Fix enumeration of properties cross origin
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162328
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsembeddedcontenttheimgelementcurrentpixeldensitybasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic-expected.txt (206239 => 206240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic-expected.txt 2016-09-21 22:52:37 UTC (rev 206239)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic-expected.txt 2016-09-21 22:52:42 UTC (rev 206240)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> FAIL <img srcset="/images/green-256x256.png 256w" sizes="512px" data-expect="512"> assert_equals: naturalWidth expected 512 but got 256
</span><span class="cx"> FAIL <img srcset="/images/green-256x256.png 256w" sizes="1px" data-expect="1"> assert_equals: naturalWidth expected 1 but got 256
</span><span class="cx"> FAIL <img srcset="/images/green-256x256.png 256w" sizes="0px" data-expect="0"> assert_equals: naturalWidth expected 0 but got 256
</span><del>-PASS <img srcset="data:image/svg+xml,&lt;svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'%20height='20'&gt;&lt;circle%20r='1'/&gt;&lt;/svg&gt; 2x" data-expect="10">
-PASS <img srcset="data:image/svg+xml,&lt;svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'&gt;&lt;circle%20r='1'/&gt;&lt;/svg&gt; 2x" data-expect="10">
-PASS <img srcset="data:image/svg+xml,&lt;svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'&gt;&lt;circle%20r='1'/&gt;&lt;/svg&gt; 2x" data-expect="10">
</del><ins>+PASS <img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
+PASS <img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'><circle%20r='1'/></svg> 2x" data-expect="10">
+PASS <img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
</ins><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 (206239 => 206240)</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-21 22:52:37 UTC (rev 206239)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt 2016-09-21 22:52:42 UTC (rev 206240)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> PASS innerHTML 4 <a b="&amp;"></a>
</span><span class="cx"> PASS innerHTML 5 <a b="&nbsp;"></a>
</span><span class="cx"> PASS innerHTML 6 <a b="&quot;"></a>
</span><del>-FAIL innerHTML 7 <a b="<"></a> assert_equals: expected "<a b=\"<\"></a>" but got "<a b=\"&lt;\"></a>"
-FAIL innerHTML 8 <a b=">"></a> assert_equals: expected "<a b=\">\"></a>" but got "<a b=\"&gt;\"></a>"
</del><ins>+PASS innerHTML 7 <a b="<"></a>
+PASS innerHTML 8 <a b=">"></a>
</ins><span class="cx"> PASS innerHTML 9 <svg xlink:href="a"></svg>
</span><span class="cx"> PASS innerHTML 10 <svg xmlns:svg="test"></svg>
</span><span class="cx"> PASS innerHTML 11 a
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> PASS outerHTML 4 <span><a b="&amp;"></a></span>
</span><span class="cx"> PASS outerHTML 5 <span><a b="&nbsp;"></a></span>
</span><span class="cx"> PASS outerHTML 6 <span><a b="&quot;"></a></span>
</span><del>-FAIL outerHTML 7 <span><a b="<"></a></span> assert_equals: expected "<span><a b=\"<\"></a></span>" but got "<span><a b=\"&lt;\"></a></span>"
-FAIL outerHTML 8 <span><a b=">"></a></span> assert_equals: expected "<span><a b=\">\"></a></span>" but got "<span><a b=\"&gt;\"></a></span>"
</del><ins>+PASS outerHTML 7 <span><a b="<"></a></span>
+PASS outerHTML 8 <span><a b=">"></a></span>
</ins><span class="cx"> PASS outerHTML 9 <span><svg xlink:href="a"></svg></span>
</span><span class="cx"> PASS outerHTML 10 <span><svg xmlns:svg="test"></svg></span>
</span><span class="cx"> PASS outerHTML 11 <span>a</span>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206239 => 206240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-21 22:52:37 UTC (rev 206239)
+++ trunk/Source/WebCore/ChangeLog 2016-09-21 22:52:42 UTC (rev 206240)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-09-21 Chris Dumez <cdumez@apple.com>
+
+ Fix serialization of HTML Element attributes
+ https://bugs.webkit.org/show_bug.cgi?id=162356
+
+ Reviewed by Alex Christensen.
+
+ Fix serialization of HTML Element attributes to align with:
+ - https://html.spec.whatwg.org/#html-fragment-serialisation-algorithm
+ - https://html.spec.whatwg.org/#escapingString
+
+ In particular, we should not escape '<' and '>'.
+
+ Firefox and Chrome both match the specification.
+
+ Note that we keep escaping '<' and '>' for Element attributes in the
+ context of XML serialization, as per:
+ - https://w3c.github.io/DOM-Parsing/#dfn-serializing-an-attribute-value
+
+ No new tests, rebaselined existing test.
+
+ * editing/MarkupAccumulator.h:
+
</ins><span class="cx"> 2016-09-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> support openPaymentSetup API on ApplePaySession object
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.h (206239 => 206240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.h 2016-09-21 22:52:37 UTC (rev 206239)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.h 2016-09-21 22:52:42 UTC (rev 206240)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> EntityMaskInPCDATA = EntityAmp | EntityLt | EntityGt,
</span><span class="cx"> EntityMaskInHTMLPCDATA = EntityMaskInPCDATA | EntityNbsp,
</span><span class="cx"> EntityMaskInAttributeValue = EntityAmp | EntityLt | EntityGt | EntityQuot,
</span><del>- EntityMaskInHTMLAttributeValue = EntityMaskInAttributeValue | EntityNbsp,
</del><ins>+ EntityMaskInHTMLAttributeValue = EntityAmp | EntityQuot | EntityNbsp,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // FIXME: Noncopyable?
</span></span></pre>
</div>
</div>
</body>
</html>