Changeset 207914 in webkit

Timestamp:

Oct 26, 2016 4:15:51 PM (7 years ago)

Author:

Chris Dumez

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/URLSearchParams.h (modified) (3 diffs)
• html/URLSearchParams.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2016-10-26  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/html/URLSearchParams.h

@@ -26 +26 @@
 
 #include "DOMURL.h"
+#include <wtf/Variant.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
@@ -33 +34 @@
 class URLSearchParams : public RefCounted<URLSearchParams> {
 public:
-    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)); }
+    using StringOrURLSearchParams = WTF::Variant<String, RefPtr<URLSearchParams>>;
+    static Ref<URLSearchParams> create(const StringOrURLSearchParams&, DOMURL* associatedURL = nullptr);
 
     void associatedURLDestroyed() { m_associatedURL = nullptr; }
@@ -56 +57 @@
 };
 
+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);
 }
+
+} // namespace WebCore

trunk/Source/WebCore/html/URLSearchParams.idl

@@ -25 +25 @@
 
 [
-    // FIXME: This should use unions once they are supported
-    Constructor(optional USVString arg = ""),
-    Constructor(URLSearchParams init),
+    Constructor(optional (USVString or URLSearchParams) init = ""),
     Exposed=(Window,Worker),
     ImplementationLacksVTable,