Changeset 223446 in webkit

Timestamp:

Oct 16, 2017 4:29:36 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Allow modern decoding of URLs
​https://bugs.webkit.org/show_bug.cgi?id=178265

Patch by Alex Christensen <​achristensen@webkit.org> on 2017-10-16
Reviewed by Chris Dumez.

• platform/URL.h:

(WebCore::URL::decode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/URL.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-16  Alex Christensen  <achristensen@webkit.org>
+
+        Allow modern decoding of URLs
+        https://bugs.webkit.org/show_bug.cgi?id=178265
+
+        Reviewed by Chris Dumez.
+
+        * platform/URL.h:
+        (WebCore::URL::decode):
+
 2017-10-16  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/platform/URL.h

@@ -206 +206 @@
     template <class Encoder> void encode(Encoder&) const;
     template <class Decoder> static bool decode(Decoder&, URL&);
+    template <class Decoder> static std::optional<URL> decode(Decoder&);
 
     String serialize(bool omitFragment = false) const;
@@ -262 +263 @@
 bool URL::decode(Decoder& decoder, URL& url)
 {
+    auto optionalURL = URL::decode(decoder);
+    if (!optionalURL)
+        return false;
+    url = WTFMove(*optionalURL);
+    return true;
+}
+
+template <class Decoder>
+std::optional<URL> URL::decode(Decoder& decoder)
+{
+    URL url;
     if (!decoder.decode(url.m_string))
-        return false;
+        return std::nullopt;
     bool isValid;
     if (!decoder.decode(isValid))
-        return false;
+        return std::nullopt;
     url.m_isValid = isValid;
     if (!isValid)
-        return true;
+        return WTFMove(url);
     bool protocolIsInHTTPFamily;
     if (!decoder.decode(protocolIsInHTTPFamily))
-        return false;
+        return std::nullopt;
     url.m_protocolIsInHTTPFamily = protocolIsInHTTPFamily;
     if (!decoder.decode(url.m_schemeEnd))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_userStart))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_userEnd))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_passwordEnd))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_hostEnd))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_portEnd))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_pathAfterLastSlash))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_pathEnd))
-        return false;
+        return std::nullopt;
     if (!decoder.decode(url.m_queryEnd))
-        return false;
-    return true;
+        return std::nullopt;
+    return WTFMove(url);
 }