<!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>[210946] 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/210946">210946</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-01-19 17:35:58 -0800 (Thu, 19 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Construct URLSearchParams from array or object
https://bugs.webkit.org/show_bug.cgi?id=166973
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
* web-platform-tests/url/urlsearchparams-constructor-expected.txt:
Source/WebCore:
Covered by newly passing web platform tests.
* html/URLSearchParams.cpp:
(WebCore::URLSearchParams::URLSearchParams):
(WebCore::URLSearchParams::create):
(WebCore::URLSearchParams::get):
(WebCore::URLSearchParams::has):
(WebCore::URLSearchParams::sort):
(WebCore::URLSearchParams::set):
(WebCore::URLSearchParams::getAll):
(WebCore::URLSearchParams::remove):
(WebCore::URLSearchParams::Iterator::next):
* html/URLSearchParams.h:
(WebCore::URLSearchParams::create):
(WebCore::URLSearchParams::pairs):
(WebCore::URLSearchParams::operator const Vector<std::pair<String, String>>&): Deleted.
* html/URLSearchParams.idl:
* platform/URLParser.cpp:
(WebCore::URLParser::serialize):
* platform/URLParser.h:
Source/WebKit2:
* NetworkProcess/capture/NetworkCaptureManager.cpp:
(WebKit::NetworkCapture::Manager::fuzzyMatchURLs):
Change std::pair's first/second to WTF::KeyValuePair's key/value.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsurlurlsearchparamsconstructorexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-constructor-expected.txt</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>
<li><a href="#trunkSourceWebCoreplatformURLParsercpp">trunk/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParserh">trunk/Source/WebCore/platform/URLParser.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureManagercpp">trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.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 (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-01-19 Alex Christensen <achristensen@webkit.org>
+
+ Construct URLSearchParams from array or object
+ https://bugs.webkit.org/show_bug.cgi?id=166973
+
+ Reviewed by Sam Weinig.
+
+ * web-platform-tests/url/urlsearchparams-constructor-expected.txt:
+
</ins><span class="cx"> 2017-01-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Implement URLSearchParams's sort()
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsurlurlsearchparamsconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-constructor-expected.txt (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-constructor-expected.txt 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/url/urlsearchparams-constructor-expected.txt 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx">
</span><span class="cx"> PASS Basic URLSearchParams construction
</span><span class="cx"> PASS URLSearchParams constructor, no arguments
</span><del>-FAIL URLSearchParams constructor, DOMException.prototype as argument Can only call DOMException.toString on instances of DOMException
</del><ins>+FAIL URLSearchParams constructor, DOMException.prototype as argument assert_equals: expected "Error=" but got "INDEX_SIZE_ERR=1&DOMSTRING_SIZE_ERR=2&HIERARCHY_REQUEST_ERR=3&WRONG_DOCUMENT_ERR=4&INVALID_CHARACTER_ERR=5&NO_DATA_ALLOWED_ERR=6&NO_MODIFICATION_ALLOWED_ERR=7&NOT_FOUND_ERR=8&NOT_SUPPORTED_ERR=9&INUSE_ATTRIBUTE_ERR=10&INVALID_STATE_ERR=11&SYNTAX_ERR=12&INVALID_MODIFICATION_ERR=13&NAMESPACE_ERR=14&INVALID_ACCESS_ERR=15&VALIDATION_ERR=16&TYPE_MISMATCH_ERR=17&SECURITY_ERR=18&NETWORK_ERR=19&ABORT_ERR=20&URL_MISMATCH_ERR=21&QUOTA_EXCEEDED_ERR=22&TIMEOUT_ERR=23&INVALID_NODE_TYPE_ERR=24&DATA_CLONE_ERR=25"
</ins><span class="cx"> PASS URLSearchParams constructor, empty string as argument
</span><del>-FAIL URLSearchParams constructor, {} as argument assert_equals: expected "" but got "%5Bobject+Object%5D="
</del><ins>+PASS URLSearchParams constructor, {} as argument
</ins><span class="cx"> PASS URLSearchParams constructor, string.
</span><span class="cx"> PASS URLSearchParams constructor, object.
</span><span class="cx"> PASS Parse +
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> PASS Parse %e2%8e%84
</span><span class="cx"> PASS Parse 💩
</span><span class="cx"> PASS Parse %f0%9f%92%a9
</span><del>-FAIL Construct with object with + assert_array_equals: property 0, expected " " but got "[object Object]"
-FAIL Construct with object with two keys assert_array_equals: property 0, expected "c" but got "[object Object]"
-FAIL Construct with array with two keys assert_array_equals: property 0, expected "c" but got "c,x,a,?"
-FAIL Custom [Symbol.iterator] assert_equals: expected (string) "b" but got (object) null
</del><ins>+FAIL Construct with object with + assert_array_equals: property 0, expected " " but got "+"
+PASS Construct with object with two keys
+PASS Construct with array with two keys
+PASS Custom [Symbol.iterator]
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebCore/ChangeLog 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-01-19 Alex Christensen <achristensen@webkit.org>
+
+ Construct URLSearchParams from array or object
+ https://bugs.webkit.org/show_bug.cgi?id=166973
+
+ Reviewed by Sam Weinig.
+
+ Covered by newly passing web platform tests.
+
+ * html/URLSearchParams.cpp:
+ (WebCore::URLSearchParams::URLSearchParams):
+ (WebCore::URLSearchParams::create):
+ (WebCore::URLSearchParams::get):
+ (WebCore::URLSearchParams::has):
+ (WebCore::URLSearchParams::sort):
+ (WebCore::URLSearchParams::set):
+ (WebCore::URLSearchParams::getAll):
+ (WebCore::URLSearchParams::remove):
+ (WebCore::URLSearchParams::Iterator::next):
+ * html/URLSearchParams.h:
+ (WebCore::URLSearchParams::create):
+ (WebCore::URLSearchParams::pairs):
+ (WebCore::URLSearchParams::operator const Vector<std::pair<String, String>>&): Deleted.
+ * html/URLSearchParams.idl:
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::serialize):
+ * platform/URLParser.h:
+
</ins><span class="cx"> 2017-01-19 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> CRASH at WebCore::TrackListBase::remove
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.cpp (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.cpp 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebCore/html/URLSearchParams.cpp 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "URLSearchParams.h"
</span><span class="cx">
</span><span class="cx"> #include "DOMURL.h"
</span><ins>+#include "ExceptionCode.h"
</ins><span class="cx"> #include "URLParser.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -36,16 +37,34 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-URLSearchParams::URLSearchParams(const Vector<std::pair<String, String>>& pairs)
</del><ins>+URLSearchParams::URLSearchParams(const Vector<WTF::KeyValuePair<String, String>>& pairs)
</ins><span class="cx"> : m_pairs(pairs)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ExceptionOr<Ref<URLSearchParams>> URLSearchParams::create(Variant<Vector<Vector<String>>, Vector<WTF::KeyValuePair<String, String>>, String>&& variant)
+{
+ auto visitor = WTF::makeVisitor([&](const Vector<Vector<String>>& vector) -> ExceptionOr<Ref<URLSearchParams>> {
+ Vector<WTF::KeyValuePair<String, String>> pairs;
+ for (const auto& pair : vector) {
+ if (pair.size() != 2)
+ return Exception { TypeError };
+ pairs.append({pair[0], pair[1]});
+ }
+ return adoptRef(*new URLSearchParams(WTFMove(pairs)));
+ }, [&](const Vector<WTF::KeyValuePair<String, String>>& pairs) {
+ return adoptRef(*new URLSearchParams(pairs));
+ }, [&](const String& string) {
+ return adoptRef(*new URLSearchParams(string, nullptr));
+ });
+ return WTF::visit(visitor, variant);
+}
+
</ins><span class="cx"> String URLSearchParams::get(const String& name) const
</span><span class="cx"> {
</span><span class="cx"> for (const auto& pair : m_pairs) {
</span><del>- if (pair.first == name)
- return pair.second;
</del><ins>+ if (pair.key == name)
+ return pair.value;
</ins><span class="cx"> }
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="lines">@@ -53,7 +72,7 @@
</span><span class="cx"> bool URLSearchParams::has(const String& name) const
</span><span class="cx"> {
</span><span class="cx"> for (const auto& pair : m_pairs) {
</span><del>- if (pair.first == name)
</del><ins>+ if (pair.key == name)
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -61,8 +80,8 @@
</span><span class="cx">
</span><span class="cx"> void URLSearchParams::sort()
</span><span class="cx"> {
</span><del>- 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);
</del><ins>+ std::stable_sort(m_pairs.begin(), m_pairs.end(), [] (const auto& a, const auto& b) {
+ return WTF::codePointCompareLessThan(a.key, b.key);
</ins><span class="cx"> });
</span><span class="cx"> updateURL();
</span><span class="cx"> }
</span><span class="lines">@@ -70,14 +89,13 @@
</span><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><del>- if (pair.first != name)
</del><ins>+ if (pair.key != name)
</ins><span class="cx"> continue;
</span><del>- if (pair.second != value)
- pair.second = value;
</del><ins>+ if (pair.value != value)
+ pair.value = value;
</ins><span class="cx"> bool skippedFirstMatch = false;
</span><span class="cx"> m_pairs.removeAllMatching([&] (const auto& pair) {
</span><del>- bool nameMatches = pair.first == name;
- if (nameMatches) {
</del><ins>+ if (pair.key == name) {
</ins><span class="cx"> if (skippedFirstMatch)
</span><span class="cx"> return true;
</span><span class="cx"> skippedFirstMatch = true;
</span><span class="lines">@@ -102,8 +120,8 @@
</span><span class="cx"> Vector<String> values;
</span><span class="cx"> values.reserveInitialCapacity(m_pairs.size());
</span><span class="cx"> for (const auto& pair : m_pairs) {
</span><del>- if (pair.first == name)
- values.uncheckedAppend(pair.second);
</del><ins>+ if (pair.key == name)
+ values.uncheckedAppend(pair.value);
</ins><span class="cx"> }
</span><span class="cx"> return values;
</span><span class="cx"> }
</span><span class="lines">@@ -110,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> void URLSearchParams::remove(const String& name)
</span><span class="cx"> {
</span><del>- if (m_pairs.removeAllMatching([&] (const auto& pair) { return pair.first == name; }))
</del><ins>+ if (m_pairs.removeAllMatching([&] (const auto& pair) { return pair.key == name; }))
</ins><span class="cx"> updateURL();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,7 +157,7 @@
</span><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><span class="cx"> auto& pair = pairs[m_index++];
</span><del>- return WTF::KeyValuePair<String, String> { pair.first, pair.second };
</del><ins>+ return WTF::KeyValuePair<String, String> { pair.key, pair.value };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URLSearchParams::Iterator::Iterator(URLSearchParams& params)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.h (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.h 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebCore/html/URLSearchParams.h 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -33,8 +33,11 @@
</span><span class="cx">
</span><span class="cx"> class URLSearchParams : public RefCounted<URLSearchParams> {
</span><span class="cx"> public:
</span><del>- using StringOrURLSearchParams = WTF::Variant<String, RefPtr<URLSearchParams>>;
- static Ref<URLSearchParams> create(const StringOrURLSearchParams&, DOMURL* associatedURL = nullptr);
</del><ins>+ static ExceptionOr<Ref<URLSearchParams>> create(Variant<Vector<Vector<String>>, Vector<WTF::KeyValuePair<String, String>>, String>&&);
+ static Ref<URLSearchParams> create(const String& string, DOMURL* associatedURL)
+ {
+ return adoptRef(*new URLSearchParams(string, associatedURL));
+ }
</ins><span class="cx">
</span><span class="cx"> void associatedURLDestroyed() { m_associatedURL = nullptr; }
</span><span class="cx"> void append(const String& name, const String& value);
</span><span class="lines">@@ -44,8 +47,6 @@
</span><span class="cx"> bool has(const String& name) const;
</span><span class="cx"> void set(const String& name, const String& value);
</span><span class="cx"> String toString() const;
</span><del>- const Vector<std::pair<String, String>>& pairs() const { return m_pairs; }
- operator const Vector<std::pair<String, String>>&() { return m_pairs; }
</del><span class="cx"> void updateFromAssociatedURL();
</span><span class="cx"> void sort();
</span><span class="cx">
</span><span class="lines">@@ -61,22 +62,13 @@
</span><span class="cx"> Iterator createIterator() { return Iterator { *this }; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ const Vector<WTF::KeyValuePair<String, String>>& pairs() const { return m_pairs; }
</ins><span class="cx"> URLSearchParams(const String&, DOMURL*);
</span><del>- explicit URLSearchParams(const Vector<std::pair<String, String>>&);
</del><ins>+ URLSearchParams(const Vector<WTF::KeyValuePair<String, String>>&);
</ins><span class="cx"> void updateURL();
</span><span class="cx">
</span><span class="cx"> DOMURL* m_associatedURL { nullptr };
</span><del>- Vector<std::pair<String, String>> m_pairs;
</del><ins>+ Vector<WTF::KeyValuePair<String, String>> m_pairs;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-inline Ref<URLSearchParams> URLSearchParams::create(const StringOrURLSearchParams& variant, DOMURL* associatedURL)
-{
- auto visitor = WTF::makeVisitor([&](const String& string) {
- return adoptRef(*new URLSearchParams(string, associatedURL));
- }, [&](const RefPtr<URLSearchParams>& params) {
- return adoptRef(*new URLSearchParams(static_cast<const Vector<std::pair<String, String>>&>(*params)));
- });
- return WTF::visit(visitor, variant);
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.idl (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.idl 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebCore/html/URLSearchParams.idl 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Constructor(optional (USVString or URLSearchParams) init = ""),
</del><ins>+ Constructor(optional (sequence<sequence<USVString>> or record<USVString, USVString> or USVString) init = ""),
+ ConstructorMayThrowException,
</ins><span class="cx"> Exposed=(Window,Worker),
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface URLSearchParams {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -2717,7 +2717,7 @@
</span><span class="cx"> auto name = formURLDecode(bytes.substring(0, valueStart));
</span><span class="cx"> auto value = formURLDecode(bytes.substring(valueStart + 1));
</span><span class="cx"> if (name && value)
</span><del>- output.append(std::make_pair(name.value().replace('+', 0x20), value.value().replace('+', 0x20)));
</del><ins>+ output.append({name.value().replace('+', 0x20), value.value().replace('+', 0x20)});
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return output;
</span><span class="lines">@@ -2750,9 +2750,9 @@
</span><span class="cx"> for (auto& tuple : tuples) {
</span><span class="cx"> if (!output.isEmpty())
</span><span class="cx"> output.append('&');
</span><del>- serializeURLEncodedForm(tuple.first, output);
</del><ins>+ serializeURLEncodedForm(tuple.key, output);
</ins><span class="cx"> output.append('=');
</span><del>- serializeURLEncodedForm(tuple.second, output);
</del><ins>+ serializeURLEncodedForm(tuple.value, output);
</ins><span class="cx"> }
</span><span class="cx"> return String::adopt(WTFMove(output));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebCore/platform/URLParser.h 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> WEBCORE_EXPORT static bool enabled();
</span><span class="cx"> WEBCORE_EXPORT static void setEnabled(bool);
</span><span class="cx">
</span><del>- typedef Vector<std::pair<String, String>> URLEncodedForm;
</del><ins>+ typedef Vector<WTF::KeyValuePair<String, String>> URLEncodedForm;
</ins><span class="cx"> WEBCORE_EXPORT static URLEncodedForm parseURLEncodedForm(StringView);
</span><span class="cx"> static String serialize(const URLEncodedForm&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-19 Alex Christensen <achristensen@webkit.org>
+
+ Construct URLSearchParams from array or object
+ https://bugs.webkit.org/show_bug.cgi?id=166973
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/capture/NetworkCaptureManager.cpp:
+ (WebKit::NetworkCapture::Manager::fuzzyMatchURLs):
+ Change std::pair's first/second to WTF::KeyValuePair's key/value.
+
</ins><span class="cx"> 2017-01-19 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Move the PDF password view into its own class for possible reuse
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp (210945 => 210946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp 2017-01-20 01:09:20 UTC (rev 210945)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureManager.cpp 2017-01-20 01:35:58 UTC (rev 210946)
</span><span class="lines">@@ -286,14 +286,14 @@
</span><span class="cx"> auto resourceParameter = std::begin(resourceParameters);
</span><span class="cx">
</span><span class="cx"> for (; requestParameter != std::end(requestParameters) && resourceParameter != std::end(resourceParameters); ++requestParameter, ++resourceParameter) {
</span><del>- if (requestParameter->first == resourceParameter->first) {
</del><ins>+ if (requestParameter->key == resourceParameter->key) {
</ins><span class="cx"> #if ENABLE(WTF_CAPTURE_INTERNAL_DEBUGGING)
</span><del>- if (requestParameter->second == resourceParameter->second)
</del><ins>+ if (requestParameter->value == resourceParameter->value)
</ins><span class="cx"> DEBUG_LOG("Matching parameter names and values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second));
</span><span class="cx"> else
</span><span class="cx"> DEBUG_LOG("Mismatching parameter values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\" vs. \"" STRING_SPECIFIER "\"", DEBUG_STR(requestParameter->first), DEBUG_STR(requestParameter->second), DEBUG_STR(resourceParameter->second));
</span><span class="cx"> #endif
</span><del>- score += (requestParameter->second == resourceParameter->second) ? kParameterMatchScore : kParameterMismatchScore;
</del><ins>+ score += (requestParameter->value == resourceParameter->value) ? kParameterMatchScore : kParameterMismatchScore;
</ins><span class="cx"> DEBUG_LOG("Score = %d", score);
</span><span class="cx"> } else {
</span><span class="cx"> DEBUG_LOG("Mismatching parameter names: " STRING_SPECIFIER ", " STRING_SPECIFIER, DEBUG_STR(requestParameter->first), DEBUG_STR(resourceParameter->first));
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx">
</span><span class="cx"> const auto scanForwardForMatch = [this, &score, kParameterMatchScore, kParameterMismatchScore, kParameterMissingScore](const auto& fixedIter, auto& scanningIter, const auto& scannerEnd) {
</span><span class="cx"> auto scanner = scanningIter;
</span><del>- while (scanner != scannerEnd && scanner->first != fixedIter->first)
</del><ins>+ while (scanner != scannerEnd && scanner->key != fixedIter->key)
</ins><span class="cx"> ++scanner;
</span><span class="cx"> if (scanner == scannerEnd)
</span><span class="cx"> return false;
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> else
</span><span class="cx"> DEBUG_LOG("Mismatching parameter values: \"" STRING_SPECIFIER "\" = \"" STRING_SPECIFIER "\" vs. \"" STRING_SPECIFIER "\"", DEBUG_STR(fixedIter->first), DEBUG_STR(fixedIter->second), DEBUG_STR(scanner->second));
</span><span class="cx"> #endif
</span><del>- score += (fixedIter->second == scanner->second) ? kParameterMatchScore : kParameterMismatchScore;
</del><ins>+ score += (fixedIter->value == scanner->value) ? kParameterMatchScore : kParameterMismatchScore;
</ins><span class="cx"> DEBUG_LOG("Score = %d", score);
</span><span class="cx"> scanningIter = scanner;
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>