<!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>[210915] 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/210915">210915</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-01-18 23:45:30 -0800 (Wed, 18 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement URLSearchParams's sort()
https://bugs.webkit.org/show_bug.cgi?id=167154
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
* web-platform-tests/url/urlsearchparams-sort-expected.txt: Added.
* web-platform-tests/url/urlsearchparams-sort.html: Added.
Source/WebCore:
Test: imported/w3c/web-platform-tests/url/urlsearchparams-sort.html
* html/URLSearchParams.cpp:
(WebCore::URLSearchParams::sort):
* html/URLSearchParams.h:
* html/URLSearchParams.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlURLSearchParamscpp">trunk/Source/WebCore/html/URLSearchParams.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlURLSearchParamsh">trunk/Source/WebCore/html/URLSearchParams.h</a></li>
<li><a href="#trunkSourceWebCorehtmlURLSearchParamsidl">trunk/Source/WebCore/html/URLSearchParams.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsurlurlsearchparamssortexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsurlurlsearchparamssorthtml">trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (210914 => 210915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-01-19 07:13:54 UTC (rev 210914)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-01-19 07:45:30 UTC (rev 210915)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-18 Alex Christensen <achristensen@webkit.org>
+
+ Implement URLSearchParams's sort()
+ https://bugs.webkit.org/show_bug.cgi?id=167154
+
+ Reviewed by Sam Weinig.
+
+ * web-platform-tests/url/urlsearchparams-sort-expected.txt: Added.
+ * web-platform-tests/url/urlsearchparams-sort.html: Added.
+
</ins><span class="cx"> 2017-01-18 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Reject fetch promise in case of ReadableStream upload
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsurlurlsearchparamssortexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort-expected.txt (0 => 210915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort-expected.txt 2017-01-19 07:45:30 UTC (rev 210915)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+
+PASS Parse and sort: z=b&a=b&z=a&a=a
+PASS URL parse and sort: z=b&a=b&z=a&a=a
+PASS Parse and sort: �=x&&�=a
+PASS URL parse and sort: �=x&&�=a
+PASS Parse and sort: ffi&🌈
+PASS URL parse and sort: ffi&🌈
+PASS Parse and sort: é&e�&é
+PASS URL parse and sort: é&e�&é
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsurlurlsearchparamssorthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort.html (0 => 210915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-sort.html 2017-01-19 07:45:30 UTC (rev 210915)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!doctype html>
+<meta charset="utf8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+[
+ {
+ "input": "z=b&a=b&z=a&a=a",
+ "output": [["a", "b"], ["a", "a"], ["z", "b"], ["z", "a"]]
+ },
+ {
+ "input": "\uFFFD=x&\uFFFC&\uFFFD=a",
+ "output": [["\uFFFC", ""], ["\uFFFD", "x"], ["\uFFFD", "a"]]
+ },
+ {
+ "input": "ffi&🌈", // 🌈 > code point, but < code unit because two code units
+ "output": [["🌈", ""], ["ffi", ""]]
+ },
+ {
+ "input": "é&e\uFFFD&e\u0301",
+ "output": [["e\u0301", ""], ["e\uFFFD", ""], ["é", ""]]
+ }
+].forEach((val) => {
+ test(() => {
+ let params = new URLSearchParams(val.input),
+ i = 0
+ params.sort()
+ for(let param of params) {
+ assert_array_equals(param, val.output[i])
+ i++
+ }
+ }, "Parse and sort: " + val.input)
+
+ test(() => {
+ let url = new URL("?" + val.input, "https://example/")
+ url.searchParams.sort()
+ let params = new URLSearchParams(url.search),
+ i = 0
+ for(let param of params) {
+ assert_array_equals(param, val.output[i])
+ i++
+ }
+ }, "URL parse and sort: " + val.input)
+})
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210914 => 210915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-19 07:13:54 UTC (rev 210914)
+++ trunk/Source/WebCore/ChangeLog 2017-01-19 07:45:30 UTC (rev 210915)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-18 Alex Christensen <achristensen@webkit.org>
+
+ Implement URLSearchParams's sort()
+ https://bugs.webkit.org/show_bug.cgi?id=167154
+
+ Reviewed by Sam Weinig.
+
+ Test: imported/w3c/web-platform-tests/url/urlsearchparams-sort.html
+
+ * html/URLSearchParams.cpp:
+ (WebCore::URLSearchParams::sort):
+ * html/URLSearchParams.h:
+ * html/URLSearchParams.idl:
+
</ins><span class="cx"> 2017-01-18 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Add Link header support for preload.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.cpp (210914 => 210915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.cpp 2017-01-19 07:13:54 UTC (rev 210914)
+++ trunk/Source/WebCore/html/URLSearchParams.cpp 2017-01-19 07:45:30 UTC (rev 210915)
</span><span class="lines">@@ -59,6 +59,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void URLSearchParams::sort()
+{
+ std::stable_sort(m_pairs.begin(), m_pairs.end(), [] (const std::pair<String, String>& a, const std::pair<String, String>& b) {
+ return WTF::codePointCompareLessThan(a.first, b.first);
+ });
+ updateURL();
+}
+
</ins><span class="cx"> void URLSearchParams::set(const String& name, const String& value)
</span><span class="cx"> {
</span><span class="cx"> for (auto& pair : m_pairs) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.h (210914 => 210915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.h 2017-01-19 07:13:54 UTC (rev 210914)
+++ trunk/Source/WebCore/html/URLSearchParams.h 2017-01-19 07:45:30 UTC (rev 210915)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> const Vector<std::pair<String, String>>& pairs() const { return m_pairs; }
</span><span class="cx"> operator const Vector<std::pair<String, String>>&() { return m_pairs; }
</span><span class="cx"> void updateFromAssociatedURL();
</span><ins>+ void sort();
</ins><span class="cx">
</span><span class="cx"> class Iterator {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.idl (210914 => 210915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.idl 2017-01-19 07:13:54 UTC (rev 210914)
+++ trunk/Source/WebCore/html/URLSearchParams.idl 2017-01-19 07:45:30 UTC (rev 210915)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx"> sequence<USVString> getAll(USVString name);
</span><span class="cx"> boolean has(USVString name);
</span><span class="cx"> void set(USVString name, USVString value);
</span><ins>+
+ void sort();
+
</ins><span class="cx"> iterable<USVString, USVString>;
</span><span class="cx">
</span><span class="cx"> // FIXME: This should just be stringifier once that is supported in the bindings generator
</span></span></pre>
</div>
</div>
</body>
</html>