<!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>[206663] 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/206663">206663</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-30 14:03:27 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fragment serialization should always use 'xml:' prefix for attributes in XML namespace
https://bugs.webkit.org/show_bug.cgi?id=162803
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt:
Source/WebCore:
Fragment serialization should always use 'xml:' prefix for attributes in XML namespace:
- https://html.spec.whatwg.org/#serialising-html-fragments
"""
If the attribute is in the XML namespace
-> The attribute's serialized name is the string "xml:" followed by the attribute's local name.
"""
- https://www.w3.org/TR/DOM-Parsing/#dfn-concept-xml-serialization-algorithm
"""
If ns is the XML namespace, then let qualified name be the concatenation of the string "xml:"
and the value of node's localName.
"""
Firefox complies with the specification.
No new tests, rebaselined existing test.
* editing/MarkupAccumulator.cpp:
(WebCore::MarkupAccumulator::appendAttribute):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</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="#trunkSourceWebCoreeditingMarkupAccumulatorcpp">trunk/Source/WebCore/editing/MarkupAccumulator.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 (206662 => 206663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-30 20:58:29 UTC (rev 206662)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-30 21:03:27 UTC (rev 206663)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-30 Chris Dumez <cdumez@apple.com>
+
+ Fragment serialization should always use 'xml:' prefix for attributes in XML namespace
+ https://bugs.webkit.org/show_bug.cgi?id=162803
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt:
+
</ins><span class="cx"> 2016-09-30 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> FetchBody should use UTF8Encoding to encode text data
</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 (206662 => 206663)</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-30 20:58:29 UTC (rev 206662)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/syntax/serializing-html-fragments/serializing-expected.txt 2016-09-30 21:03:27 UTC (rev 206663)
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx"> PASS outerHTML 25 <span><a><b><c></c></b><d>e</d><f><g>h</g></f></a></span>
</span><span class="cx"> PASS outerHTML 26 <span b="c"></span>
</span><span class="cx"> PASS innerHTML Attribute in the XML namespace
</span><del>-FAIL innerHTML Attribute in the XML namespace with the prefix not set to xml: assert_equals: expected "<svg xml:foo=\"test\"></svg>" but got "<svg abc:foo=\"test\"></svg>"
</del><ins>+PASS innerHTML Attribute in the XML namespace with the prefix not set to xml:
</ins><span class="cx"> PASS innerHTML Non-'xmlns' attribute in the xmlns namespace
</span><span class="cx"> PASS innerHTML 'xmlns' attribute in the xmlns namespace
</span><span class="cx"> FAIL innerHTML Attribute in non-standard namespace assert_equals: expected "<svg abc:def=\"test\"></svg>" but got "<svg def=\"test\"></svg>"
</span><span class="cx"> PASS innerHTML <span> starting with U+000A
</span><span class="cx"> PASS outerHTML Attribute in the XML namespace
</span><del>-FAIL outerHTML Attribute in the XML namespace with the prefix not set to xml: assert_equals: expected "<span><svg xml:foo=\"test\"></svg></span>" but got "<span><svg abc:foo=\"test\"></svg></span>"
</del><ins>+PASS outerHTML Attribute in the XML namespace with the prefix not set to xml:
</ins><span class="cx"> PASS outerHTML Non-'xmlns' attribute in the xmlns namespace
</span><span class="cx"> PASS outerHTML 'xmlns' attribute in the xmlns namespace
</span><span class="cx"> FAIL outerHTML Attribute in non-standard namespace assert_equals: expected "<span><svg abc:def=\"test\"></svg></span>" but got "<span><svg def=\"test\"></svg></span>"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206662 => 206663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-30 20:58:29 UTC (rev 206662)
+++ trunk/Source/WebCore/ChangeLog 2016-09-30 21:03:27 UTC (rev 206663)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-09-30 Chris Dumez <cdumez@apple.com>
+
+ Fragment serialization should always use 'xml:' prefix for attributes in XML namespace
+ https://bugs.webkit.org/show_bug.cgi?id=162803
+
+ Reviewed by Sam Weinig.
+
+ Fragment serialization should always use 'xml:' prefix for attributes in XML namespace:
+ - https://html.spec.whatwg.org/#serialising-html-fragments
+ """
+ If the attribute is in the XML namespace
+ -> The attribute's serialized name is the string "xml:" followed by the attribute's local name.
+ """
+
+ - https://www.w3.org/TR/DOM-Parsing/#dfn-concept-xml-serialization-algorithm
+ """
+ If ns is the XML namespace, then let qualified name be the concatenation of the string "xml:"
+ and the value of node's localName.
+ """
+
+ Firefox complies with the specification.
+
+ No new tests, rebaselined existing test.
+
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::MarkupAccumulator::appendAttribute):
+
</ins><span class="cx"> 2016-09-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r206611.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (206662 => 206663)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2016-09-30 20:58:29 UTC (rev 206662)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2016-09-30 21:03:27 UTC (rev 206663)
</span><span class="lines">@@ -498,15 +498,20 @@
</span><span class="cx"> result.append(attribute.name().localName());
</span><span class="cx"> else {
</span><span class="cx"> if (!attribute.namespaceURI().isEmpty()) {
</span><del>- AtomicStringImpl* foundNS = namespaces && attribute.prefix().impl() ? namespaces->get(attribute.prefix().impl()) : 0;
- bool prefixIsAlreadyMappedToOtherNS = foundNS && foundNS != attribute.namespaceURI().impl();
- if (attribute.prefix().isEmpty() || !foundNS || prefixIsAlreadyMappedToOtherNS) {
- if (AtomicStringImpl* prefix = namespaces ? namespaces->get(attribute.namespaceURI().impl()) : 0)
- prefixedName.setPrefix(AtomicString(prefix));
- else {
- bool shouldBeDeclaredUsingAppendNamespace = !attribute.prefix().isEmpty() && !foundNS;
- if (!shouldBeDeclaredUsingAppendNamespace && attribute.localName() != xmlnsAtom && namespaces)
- generateUniquePrefix(prefixedName, *namespaces);
</del><ins>+ if (attribute.namespaceURI() == XMLNames::xmlNamespaceURI) {
+ // Always use xml as prefix if the namespace is the XML namespace.
+ prefixedName.setPrefix(xmlAtom);
+ } else {
+ AtomicStringImpl* foundNS = namespaces && attribute.prefix().impl() ? namespaces->get(attribute.prefix().impl()) : 0;
+ bool prefixIsAlreadyMappedToOtherNS = foundNS && foundNS != attribute.namespaceURI().impl();
+ if (attribute.prefix().isEmpty() || !foundNS || prefixIsAlreadyMappedToOtherNS) {
+ if (AtomicStringImpl* prefix = namespaces ? namespaces->get(attribute.namespaceURI().impl()) : 0)
+ prefixedName.setPrefix(AtomicString(prefix));
+ else {
+ bool shouldBeDeclaredUsingAppendNamespace = !attribute.prefix().isEmpty() && !foundNS;
+ if (!shouldBeDeclaredUsingAppendNamespace && attribute.localName() != xmlnsAtom && namespaces)
+ generateUniquePrefix(prefixedName, *namespaces);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>