@@ -82,7 +82,7 @@
 
 static Expected<URL, String> computeValidImportSpecifier(const URL& base, const String& specifier)
 {
-    URL absoluteURL(URL(), specifier);
+    URL absoluteURL(specifier);
     if (absoluteURL.isValid())
         return absoluteURL;
 
 
@@ -1,3 +1,15 @@
+2022-02-22  Chris Dumez  <cdumez@apple.com>
+
+        Add a URL constructor that takes a String
+        https://bugs.webkit.org/show_bug.cgi?id=237068
+
+        Reviewed by Darin Adler.
+
+        Adopt the new `URL(const String&)` constructor.
+
+        * API/JSAPIGlobalObject.mm:
+        (JSC::computeValidImportSpecifier):
+
 2022-02-22  Alexander Kanavin  <alex@linutronix.de>
 
         When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
 
@@ -1,3 +1,20 @@
+2022-02-22  Chris Dumez  <cdumez@apple.com>
+
+        Add a URL constructor that takes a String
+        https://bugs.webkit.org/show_bug.cgi?id=237068
+
+        Reviewed by Darin Adler.
+
+        Add a URL constructor that takes a String to simplify our code base a bit.
+
+        * wtf/URL.cpp:
+        (WTF::URL::truncatedForUseAsBase const):
+        (WTF::URL::fakeURLWithRelativePart):
+        (WTF::URL::fileURLWithFileSystemPath):
+        * wtf/URL.h:
+        (WTF::URL::URL):
+        (WTF::URL::decode):
+
 2022-02-22  Chris Dumez  <cdumez@apple.com>
 
         Drop StringHasher::hashMemory() and use the modern Hasher instead
 
@@ -64,7 +64,12 @@ void URL::invalidate()
 
 URL::URL(const URL& base, const String& relative, const URLTextEncoding* encoding)
 {
-    *this = URLParser(relative, base, encoding).result();
+    *this = URLParser(String { relative },  base, encoding).result();
+}
+
+URL::URL(String&& absoluteURL, const URLTextEncoding* encoding)
+{
+    *this = URLParser(WTFMove(absoluteURL), URL(), encoding).result();
 }
 
 static bool shouldTrimFromURL(UChar character)
@@ -235,7 +240,7 @@ StringView URL::fragmentIdentifier() const
 
 URL URL::truncatedForUseAsBase() const
 {
-    return URL(URL(), m_string.left(m_pathAfterLastSlash));
+    return URL(m_string.left(m_pathAfterLastSlash));
 }
 
 #if !USE(CF)
@@ -571,9 +576,9 @@ static String percentEncodeCharacters(const StringType& input, bool(*shouldEncod
         return input;
 }
 
-void URL::parse(const String& string)
+void URL::parse(String&& string)
 {
-    *this = URLParser(string).result();
+    *this = URLParser(WTFMove(string)).result();
 }
 
 void URL::remove(unsigned start, unsigned length)
@@ -583,9 +588,9 @@ void URL::remove(unsigned start, unsigned length)
     ASSERT(start < m_string.length());
     ASSERT(length <= m_string.length() - start);
 
-    auto stringAfterRemoval = WTFMove(m_string);
+    auto stringAfterRemoval = std::exchange(m_string, { });
     stringAfterRemoval.remove(start, length);
-    parse(stringAfterRemoval);
+    parse(WTFMove(stringAfterRemoval));
 }
 
 void URL::setUser(StringView newUser)
@@ -1054,12 +1059,12 @@ String URL::stringCenterEllipsizedToLength(unsigned length) const
 
 URL URL::fakeURLWithRelativePart(StringView relativePart)
 {
-    return URL(URL(), makeString("webkit-fake-url://", createVersion4UUIDString(), '/', relativePart));
+    return URL(makeString("webkit-fake-url://", createVersion4UUIDString(), '/', relativePart));
 }
 
 URL URL::fileURLWithFileSystemPath(StringView path)
 {
-    return URL(URL(), makeString(
+    return URL(makeString(
         "file://",
         path.startsWith('/') ? "" : "/",
         escapePathWithoutCopying(path)
 
@@ -65,6 +65,14 @@ class URL {
     // null or empty, in which case the relative URL will be interpreted as absolute.
     WTF_EXPORT_PRIVATE URL(const URL& base, const String& relative, const URLTextEncoding* = nullptr);
 
+    // Parses the input string as an absolute URL. If you need to parse a relative URL, call the constructor above
+    // taking a base URL and a relative URL string.
+    WTF_EXPORT_PRIVATE explicit URL(String&& absoluteURL, const URLTextEncoding* = nullptr);
+    explicit URL(const String& absoluteURL, const URLTextEncoding* encoding = nullptr)
+        : URL(String { absoluteURL }, encoding)
+    {
+    }
+
     WTF_EXPORT_PRIVATE static URL fakeURLWithRelativePart(StringView);
     WTF_EXPORT_PRIVATE static URL fileURLWithFileSystemPath(StringView);
 
@@ -209,7 +217,7 @@ class URL {
     unsigned hostStart() const;
     unsigned credentialsEnd() const;
     void remove(unsigned start, unsigned length);
-    void parse(const String&);
+    void parse(String&&);
 
     friend WTF_EXPORT_PRIVATE bool protocolHostAndPortAreEqual(const URL&, const URL&);
 
@@ -313,7 +321,7 @@ template<typename Decoder> std::optional<URL> URL::decode(Decoder& decoder)
     decoder >> string;
     if (!string)
         return std::nullopt;
-    return URL(URL(), WTFMove(*string));
+    return URL(WTFMove(*string));
 }
 
 inline bool operator==(const URL& a, const URL& b)
 
@@ -1059,34 +1059,34 @@ ALWAYS_INLINE size_t URLParser::currentPosition(const CodePointIterator<Characte
     return iterator.codeUnitsSince(reinterpret_cast<const CharacterType*>(m_inputBegin));
 }
 
-URLParser::URLParser(const String& input, const URL& base, const URLTextEncoding* nonUTF8QueryEncoding)
-    : m_inputString(input)
+URLParser::URLParser(String&& input, const URL& base, const URLTextEncoding* nonUTF8QueryEncoding)
+    : m_inputString(WTFMove(input))
 {
-    if (input.isNull()) {
+    if (m_inputString.isNull()) {
         if (base.isValid() && !base.m_cannotBeABaseURL) {
             m_url = base;
             m_url.removeFragmentIdentifier();
         }
         return;
     }
 
-    if (input.is8Bit()) {
-        m_inputBegin = input.characters8();
-        parse(input.characters8(), input.length(), base, nonUTF8QueryEncoding);
+    if (m_inputString.is8Bit()) {
+        m_inputBegin = m_inputString.characters8();
+        parse(m_inputString.characters8(), m_inputString.length(), base, nonUTF8QueryEncoding);
     } else {
-        m_inputBegin = input.characters16();
-        parse(input.characters16(), input.length(), base, nonUTF8QueryEncoding);
+        m_inputBegin = m_inputString.characters16();
+        parse(m_inputString.characters16(), m_inputString.length(), base, nonUTF8QueryEncoding);
     }
 
     ASSERT(!m_url.m_isValid
-        || m_didSeeSyntaxViolation == (m_url.string() != input)
-        || (input.isAllSpecialCharacters<isC0ControlOrSpace>() && m_url.m_string == base.m_string.left(base.m_queryEnd))
+        || m_didSeeSyntaxViolation == (m_url.string() != m_inputString)
+        || (m_inputString.isAllSpecialCharacters<isC0ControlOrSpace>() && m_url.m_string == base.m_string.left(base.m_queryEnd))
         || (base.isValid() && base.protocolIs("file")));
     ASSERT(internalValuesConsistent(m_url));
 #if ASSERT_ENABLED
     if (!m_didSeeSyntaxViolation) {
         // Force a syntax violation at the beginning to make sure we get the same result.
-        URLParser parser(makeString(" ", input), base, nonUTF8QueryEncoding);
+        URLParser parser(makeString(" ", m_inputString), base, nonUTF8QueryEncoding);
         URL parsed = parser.result();
         if (parsed.isValid())
             ASSERT(allValuesEqual(parser.result(), m_url));
 
@@ -69,7 +69,7 @@ class URLParser {
     static std::optional<uint16_t> defaultPortForProtocol(StringView);
 
 private:
-    URLParser(const String&, const URL& = { }, const URLTextEncoding* = nullptr);
+    URLParser(String&&, const URL& = { }, const URLTextEncoding* = nullptr);
     URL result() { return m_url; }
 
     friend class URL;
 
@@ -1,3 +1,80 @@
+2022-02-22  Chris Dumez  <cdumez@apple.com>
+
+        Add a URL constructor that takes a String
+        https://bugs.webkit.org/show_bug.cgi?id=237068
+
+        Reviewed by Darin Adler.
+
+        Adopt the new `URL(const String&)` constructor.
+
+        * Modules/webauthn/AuthenticatorCoordinator.cpp:
+        (WebCore::AuthenticatorCoordinatorInternal::processAppIdExtension):
+        * Modules/websockets/WebSocket.cpp:
+        (WebCore::WebSocket::connect):
+        * bindings/js/ScriptModuleLoader.cpp:
+        (WebCore::resolveModuleSpecifier):
+        (WebCore::ScriptModuleLoader::fetch):
+        (WebCore::ScriptModuleLoader::moduleURL):
+        (WebCore::ScriptModuleLoader::responseURLFromRequestURL):
+        (WebCore::ScriptModuleLoader::importModule):
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::CloneDeserializer::readFile):
+        (WebCore::CloneDeserializer::readTerminal):
+        * contentextensions/ContentExtensionActions.cpp:
+        (WebCore::ContentExtensions::RedirectAction::parse):
+        (WebCore::ContentExtensions::RedirectAction::applyToRequest):
+        * dom/Document.cpp:
+        (WebCore::Document::referrer):
+        * html/URLInputType.cpp:
+        (WebCore::URLInputType::typeMismatchFor const):
+        * loader/DocumentLoader.cpp:
+        (WebCore::microsoftTeamsRedirectURL):
+        * loader/PrivateClickMeasurement.cpp:
+        (WebCore::PrivateClickMeasurement::parseAttributionRequestQuery):
+        * loader/appcache/ApplicationCacheStorage.cpp:
+        (WebCore::ApplicationCacheStorage::deleteCacheForOrigin):
+        * loader/archive/cf/LegacyWebArchive.cpp:
+        (WebCore::LegacyWebArchive::createResource):
+        * loader/archive/mhtml/MHTMLParser.cpp:
+        (WebCore::MHTMLParser::parseNextPart):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::open):
+        * page/Quirks.cpp:
+        (WebCore::isBBCDomain):
+        (WebCore::Quirks::triggerOptionalStorageAccessQuirk const):
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::createFromString):
+        (WebCore::SecurityOrigin::create):
+        * page/SecurityOriginData.cpp:
+        (WebCore::SecurityOriginData::toURL const):
+        * page/SecurityPolicy.cpp:
+        (WebCore::SecurityPolicy::generateReferrerHeader):
+        * page/csp/ContentSecurityPolicy.cpp:
+        (WebCore::ContentSecurityPolicy::reportViolation const):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::originsInMediaCache):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::clearMediaCacheForOrigins):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::setPlaybinURL):
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcMakeRequest):
+        * platform/gtk/SelectionData.cpp:
+        (WebCore::SelectionData::setURIList):
+        * platform/network/ResourceRequestBase.cpp:
+        (WebCore::ResourceRequestBase::setHTTPReferrer):
+        * platform/network/cf/ResourceErrorCF.cpp:
+        (WebCore::ResourceError::platformLazyInit):
+        * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
+        (WebCore::SocketStreamHandleImpl::SocketStreamHandleImpl):
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::didReceiveHeader):
+        * platform/network/mac/ResourceErrorMac.mm:
+        (WebCore::ResourceError::platformLazyInit):
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::writeString):
+        * testing/Internals.cpp:
+        (WebCore::Internals::sendH2Ping):
+
 2022-02-22  Chris Dumez  <cdumez@apple.com>
 
         Drop StringHasher::hashMemory() and use the modern Hasher instead
 
@@ -78,7 +78,7 @@ static String processAppIdExtension(const SecurityOrigin& facetId, const String&
         return facetId.toString();
 
     // Step 3. Relax the comparison to same site.
-    URL appIdURL(URL(), appId);
+    URL appIdURL { appId };
     if (!appIdURL.isValid() || facetId.protocol() != appIdURL.protocol() || (RegistrableDomain(appIdURL) != RegistrableDomain::uncheckedCreateFromHost(facetId.host()) && !needsAppIdQuirks(facetId.host(), appId)))
         return String();
     return appId;
 
@@ -223,7 +223,7 @@ void WebSocket::failAsynchronously()
 ExceptionOr<void> WebSocket::connect(const String& url, const Vector<String>& protocols)
 {
     LOG(Network, "WebSocket %p connect() url='%s'", this, url.utf8().data());
-    m_url = URL(URL(), url);
+    m_url = URL { url };
 
     ASSERT(scriptExecutionContext());
     auto& context = *scriptExecutionContext();
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@`
`82`	`82`
`83`	`83`	`static Expected<URL, String> computeValidImportSpecifier(const URL& base, const String& specifier)`
`84`	`84`	`{`
`85`		`- URL absoluteURL(URL(), specifier);`
	`85`	`+ URL absoluteURL(specifier);`
`86`	`86`	`if (absoluteURL.isValid())`
`87`	`87`	`return absoluteURL;`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,12 @@ void URL::invalidate()`
`64`	`64`
`65`	`65`	`URL::URL(const URL& base, const String& relative, const URLTextEncoding* encoding)`
`66`	`66`	`{`
`67`		`- *this = URLParser(relative, base, encoding).result();`
	`67`	`+ *this = URLParser(String { relative }, base, encoding).result();`
	`68`	`+}`
	`69`	`+`
	`70`	`+URL::URL(String&& absoluteURL, const URLTextEncoding* encoding)`
	`71`	`+{`
	`72`	`+ *this = URLParser(WTFMove(absoluteURL), URL(), encoding).result();`
`68`	`73`	`}`
`69`	`74`
`70`	`75`	`static bool shouldTrimFromURL(UChar character)`
`@@ -235,7 +240,7 @@ StringView URL::fragmentIdentifier() const`
`235`	`240`
`236`	`241`	`URL URL::truncatedForUseAsBase() const`
`237`	`242`	`{`
`238`		`- return URL(URL(), m_string.left(m_pathAfterLastSlash));`
	`243`	`+ return URL(m_string.left(m_pathAfterLastSlash));`
`239`	`244`	`}`
`240`	`245`
`241`	`246`	`#if !USE(CF)`
`@@ -571,9 +576,9 @@ static String percentEncodeCharacters(const StringType& input, bool(*shouldEncod`
`571`	`576`	`return input;`
`572`	`577`	`}`
`573`	`578`
`574`		`-void URL::parse(const String& string)`
	`579`	`+void URL::parse(String&& string)`
`575`	`580`	`{`
`576`		`- *this = URLParser(string).result();`
	`581`	`+ *this = URLParser(WTFMove(string)).result();`
`577`	`582`	`}`
`578`	`583`
`579`	`584`	`void URL::remove(unsigned start, unsigned length)`
`@@ -583,9 +588,9 @@ void URL::remove(unsigned start, unsigned length)`
`583`	`588`	`ASSERT(start < m_string.length());`
`584`	`589`	`ASSERT(length <= m_string.length() - start);`
`585`	`590`
`586`		`- auto stringAfterRemoval = WTFMove(m_string);`
	`591`	`+ auto stringAfterRemoval = std::exchange(m_string, { });`
`587`	`592`	`stringAfterRemoval.remove(start, length);`
`588`		`- parse(stringAfterRemoval);`
	`593`	`+ parse(WTFMove(stringAfterRemoval));`
`589`	`594`	`}`
`590`	`595`
`591`	`596`	`void URL::setUser(StringView newUser)`
`@@ -1054,12 +1059,12 @@ String URL::stringCenterEllipsizedToLength(unsigned length) const`
`1054`	`1059`
`1055`	`1060`	`URL URL::fakeURLWithRelativePart(StringView relativePart)`
`1056`	`1061`	`{`
`1057`		`- return URL(URL(), makeString("webkit-fake-url://", createVersion4UUIDString(), '/', relativePart));`
	`1062`	`+ return URL(makeString("webkit-fake-url://", createVersion4UUIDString(), '/', relativePart));`
`1058`	`1063`	`}`
`1059`	`1064`
`1060`	`1065`	`URL URL::fileURLWithFileSystemPath(StringView path)`
`1061`	`1066`	`{`
`1062`		`- return URL(URL(), makeString(`
	`1067`	`+ return URL(makeString(`
`1063`	`1068`	`"file://",`
`1064`	`1069`	`path.startsWith('/') ? "" : "/",`
`1065`	`1070`	`escapePathWithoutCopying(path)`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ void WebSocket::failAsynchronously()`
`223`	`223`	`ExceptionOr<void> WebSocket::connect(const String& url, const Vector<String>& protocols)`
`224`	`224`	`{`
`225`	`225`	`LOG(Network, "WebSocket %p connect() url='%s'", this, url.utf8().data());`
`226`		`- m_url = URL(URL(), url);`
	`226`	`+ m_url = URL { url };`
`227`	`227`
`228`	`228`	`ASSERT(scriptExecutionContext());`
`229`	`229`	`auto& context = *scriptExecutionContext();`