<!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>[207910] 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/207910">207910</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-10-26 13:39:04 -0700 (Wed, 26 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>When pasting web archive, width specifiers in srcset attribute change into density specifiers
https://bugs.webkit.org/show_bug.cgi?id=164027
<rdar://problem/28964948>
Reviewed by Tim Horton.
Source/WebCore:
Updated editing/pasteboard/img-srcset-copy-paste-canonicalization.html.
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::completeURLsInAttributeValue): Use 'w' when writing out a width
specifier.
LayoutTests:
* editing/pasteboard/img-srcset-copy-paste-canonicalization-expected.txt: Updated.
* editing/pasteboard/img-srcset-copy-paste-canonicalization.html: Changed to expect a 200w
specifier to round-trip.
* editing/pasteboard/resources/img-srcset-copy-paste-canonicalization-iframe.html: Changed
a 1x specifier to 200w.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardimgsrcsetcopypastecanonicalizationexpectedtxt">trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardimgsrcsetcopypastecanonicalizationhtml">trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization.html</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardresourcesimgsrcsetcopypastecanonicalizationiframehtml">trunk/LayoutTests/editing/pasteboard/resources/img-srcset-copy-paste-canonicalization-iframe.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207909 => 207910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-26 20:26:00 UTC (rev 207909)
+++ trunk/LayoutTests/ChangeLog 2016-10-26 20:39:04 UTC (rev 207910)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-26 Dan Bernstein <mitz@apple.com>
+
+ When pasting web archive, width specifiers in srcset attribute change into density specifiers
+ https://bugs.webkit.org/show_bug.cgi?id=164027
+ <rdar://problem/28964948>
+
+ Reviewed by Tim Horton.
+
+ * editing/pasteboard/img-srcset-copy-paste-canonicalization-expected.txt: Updated.
+ * editing/pasteboard/img-srcset-copy-paste-canonicalization.html: Changed to expect a 200w
+ specifier to round-trip.
+ * editing/pasteboard/resources/img-srcset-copy-paste-canonicalization-iframe.html: Changed
+ a 1x specifier to 200w.
+
</ins><span class="cx"> 2016-10-26 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Media Controller: playback support
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardimgsrcsetcopypastecanonicalizationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization-expected.txt (207909 => 207910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization-expected.txt 2016-10-26 20:26:00 UTC (rev 207909)
+++ trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization-expected.txt 2016-10-26 20:39:04 UTC (rev 207910)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> PASS destinationImageSegments.length is 4
</span><span class="cx"> PASS sourceImageSegments[1] is "2x,"
</span><span class="cx"> PASS destinationImageSegments[1] is "2x,"
</span><del>-PASS sourceImageSegments[3] is "1x"
-PASS destinationImageSegments[3] is "1x"
</del><ins>+PASS sourceImageSegments[3] is "200w"
+PASS destinationImageSegments[3] is "200w"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardimgsrcsetcopypastecanonicalizationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization.html (207909 => 207910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization.html 2016-10-26 20:26:00 UTC (rev 207909)
+++ trunk/LayoutTests/editing/pasteboard/img-srcset-copy-paste-canonicalization.html 2016-10-26 20:39:04 UTC (rev 207910)
</span><span class="lines">@@ -74,8 +74,8 @@
</span><span class="cx"> shouldBe("destinationImageSegments.length", "4");
</span><span class="cx"> shouldBe("sourceImageSegments[1]", "\"2x,\"");
</span><span class="cx"> shouldBe("destinationImageSegments[1]", "\"2x,\"");
</span><del>- shouldBe("sourceImageSegments[3]", "\"1x\"");
- shouldBe("destinationImageSegments[3]", "\"1x\"");
</del><ins>+ shouldBe("sourceImageSegments[3]", "\"200w\"");
+ shouldBe("destinationImageSegments[3]", "\"200w\"");
</ins><span class="cx"> maybeFinishTest();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardresourcesimgsrcsetcopypastecanonicalizationiframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/resources/img-srcset-copy-paste-canonicalization-iframe.html (207909 => 207910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/resources/img-srcset-copy-paste-canonicalization-iframe.html 2016-10-26 20:26:00 UTC (rev 207909)
+++ trunk/LayoutTests/editing/pasteboard/resources/img-srcset-copy-paste-canonicalization-iframe.html 2016-10-26 20:39:04 UTC (rev 207910)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="window.parent.runTests(window.location.href);">
</span><span class="cx"> <div id="source" contenteditable="true">
</span><del>- <img id="image" src="../../../fast/hidpi/resources/srcset.png" srcset="../../../fast/hidpi/resources/green-400-px-square.png 2x, ../../../fast/hidpi/resources/green-200-px-square.png 1x">
</del><ins>+ <img id="image" src="../../../fast/hidpi/resources/srcset.png" srcset="../../../fast/hidpi/resources/green-400-px-square.png 2x, ../../../fast/hidpi/resources/green-200-px-square.png 200w">
</ins><span class="cx"> </div>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207909 => 207910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-26 20:26:00 UTC (rev 207909)
+++ trunk/Source/WebCore/ChangeLog 2016-10-26 20:39:04 UTC (rev 207910)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-26 Dan Bernstein <mitz@apple.com>
+
+ When pasting web archive, width specifiers in srcset attribute change into density specifiers
+ https://bugs.webkit.org/show_bug.cgi?id=164027
+ <rdar://problem/28964948>
+
+ Reviewed by Tim Horton.
+
+ Updated editing/pasteboard/img-srcset-copy-paste-canonicalization.html.
+
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::completeURLsInAttributeValue): Use 'w' when writing out a width
+ specifier.
+
</ins><span class="cx"> 2016-10-26 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Media Controller: playback support
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (207909 => 207910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-10-26 20:26:00 UTC (rev 207909)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-10-26 20:39:04 UTC (rev 207910)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> if (candidate.resourceWidth != UninitializedDescriptor) {
</span><span class="cx"> result.append(' ');
</span><span class="cx"> result.appendNumber(candidate.resourceWidth);
</span><del>- result.append('x');
</del><ins>+ result.append('w');
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return result.toString();
</span></span></pre>
</div>
</div>
</body>
</html>