<!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>[207914] trunk/Source/WebCore</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/207914">207914</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-26 16:15:51 -0700 (Wed, 26 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>The URLSearchParams constructor should take a union in parameter
https://bugs.webkit.org/show_bug.cgi?id=163906
Reviewed by Darin Adler.
The URLSearchParams constructor should take a union in parameter:
- https://url.spec.whatwg.org/#urlsearchparams
No new tests, no web-exposed behavior change.
* html/URLSearchParams.h:
(WebCore::URLSearchParams::create):
* html/URLSearchParams.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207913 => 207914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-26 21:09:38 UTC (rev 207913)
+++ trunk/Source/WebCore/ChangeLog 2016-10-26 23:15:51 UTC (rev 207914)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-26 Chris Dumez <cdumez@apple.com>
+
+ The URLSearchParams constructor should take a union in parameter
+ https://bugs.webkit.org/show_bug.cgi?id=163906
+
+ Reviewed by Darin Adler.
+
+ The URLSearchParams constructor should take a union in parameter:
+ - https://url.spec.whatwg.org/#urlsearchparams
+
+ No new tests, no web-exposed behavior change.
+
+ * html/URLSearchParams.h:
+ (WebCore::URLSearchParams::create):
+ * html/URLSearchParams.idl:
+
</ins><span class="cx"> 2016-10-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Move more string conversions over to JSDOMConvert
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.h (207913 => 207914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.h 2016-10-26 21:09:38 UTC (rev 207913)
+++ trunk/Source/WebCore/html/URLSearchParams.h 2016-10-26 23:15:51 UTC (rev 207914)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "DOMURL.h"
</span><ins>+#include <wtf/Variant.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -32,8 +33,8 @@
</span><span class="cx">
</span><span class="cx"> class URLSearchParams : public RefCounted<URLSearchParams> {
</span><span class="cx"> public:
</span><del>- static Ref<URLSearchParams> create(const String& string, DOMURL* associatedURL = nullptr) { return adoptRef(*new URLSearchParams(string, associatedURL)); }
- static Ref<URLSearchParams> create(const Vector<std::pair<String, String>>& pairs) { return adoptRef(*new URLSearchParams(pairs)); }
</del><ins>+ using StringOrURLSearchParams = WTF::Variant<String, RefPtr<URLSearchParams>>;
+ static Ref<URLSearchParams> create(const StringOrURLSearchParams&, DOMURL* associatedURL = nullptr);
</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">@@ -55,4 +56,14 @@
</span><span class="cx"> Vector<std::pair<String, String>> m_pairs;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+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);
</ins><span class="cx"> }
</span><ins>+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlURLSearchParamsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLSearchParams.idl (207913 => 207914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLSearchParams.idl 2016-10-26 21:09:38 UTC (rev 207913)
+++ trunk/Source/WebCore/html/URLSearchParams.idl 2016-10-26 23:15:51 UTC (rev 207914)
</span><span class="lines">@@ -24,9 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- // FIXME: This should use unions once they are supported
- Constructor(optional USVString arg = ""),
- Constructor(URLSearchParams init),
</del><ins>+ Constructor(optional (USVString or URLSearchParams) init = ""),
</ins><span class="cx"> Exposed=(Window,Worker),
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface URLSearchParams {
</span></span></pre>
</div>
</div>
</body>
</html>