Changeset 272301 in webkit

Timestamp:

Feb 3, 2021, 12:30:22 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK][WPE] Reduce the use of SoupURI in preparation for libsoup3
​https://bugs.webkit.org/show_bug.cgi?id=221251

Reviewed by Adrian Perez de Castro.

Source/WebCore:

• platform/network/soup/AuthenticationChallengeSoup.cpp:

(WebCore::protectionSpaceServerTypeFromURL):
(WebCore::protectionSpaceFromSoupAuthAndURL):
(WebCore::AuthenticationChallenge::AuthenticationChallenge):
(WebCore::protectionSpaceServerTypeFromURI): Deleted.
(WebCore::protectionSpaceFromSoupAuthAndMessage): Deleted.

Source/WebKit:

• UIProcess/API/glib/WebKitURISchemeRequest.cpp:

(webkit_uri_scheme_request_get_scheme):
(webkit_uri_scheme_request_get_path):

• UIProcess/API/glib/WebKitWebView.cpp:

(webkit_web_view_load_uri):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp (modified) (4 diffs)
• WebKit/UIProcess/API/glib/WebKitWebView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] Reduce the use of SoupURI in preparation for libsoup3
+        https://bugs.webkit.org/show_bug.cgi?id=221251
+
+        Reviewed by Adrian Perez de Castro.
+
+        * platform/network/soup/AuthenticationChallengeSoup.cpp:
+        (WebCore::protectionSpaceServerTypeFromURL):
+        (WebCore::protectionSpaceFromSoupAuthAndURL):
+        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
+        (WebCore::protectionSpaceServerTypeFromURI): Deleted.
+        (WebCore::protectionSpaceFromSoupAuthAndMessage): Deleted.
+
 2021-02-02  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp

@@ -35 +35 @@
 namespace WebCore {
 
-static ProtectionSpaceServerType protectionSpaceServerTypeFromURI(SoupURI* uri, bool isForProxy)
+static ProtectionSpaceServerType protectionSpaceServerTypeFromURL(const URL& url, bool isForProxy)
 {
-    if (uri->scheme == SOUP_URI_SCHEME_HTTPS)
+    if (url.protocolIs("https"))
         return isForProxy ? ProtectionSpaceProxyHTTPS : ProtectionSpaceServerHTTPS;
-    if (uri->scheme == SOUP_URI_SCHEME_HTTP)
+    if (url.protocolIs("http"))
         return isForProxy ? ProtectionSpaceProxyHTTP : ProtectionSpaceServerHTTP;
-    if (uri->scheme == SOUP_URI_SCHEME_FTP)
+    if (url.protocolIs("ftp"))
         return isForProxy ? ProtectionSpaceProxyFTP : ProtectionSpaceServerFTP;
     return isForProxy ? ProtectionSpaceProxyHTTP : ProtectionSpaceServerHTTP;
 }
 
-static ProtectionSpace protectionSpaceFromSoupAuthAndMessage(SoupAuth* soupAuth, SoupMessage* message)
+static ProtectionSpace protectionSpaceFromSoupAuthAndURL(SoupAuth* soupAuth, const URL& url)
 {
     const char* schemeName = soup_auth_get_scheme_name(soupAuth);
@@ -61 +61 @@
         scheme = ProtectionSpaceAuthenticationSchemeUnknown;
 
-    SoupURI* soupURI = soup_message_get_uri(message);
-    return ProtectionSpace(String::fromUTF8(soup_uri_get_host(soupURI)), soup_uri_get_port(soupURI),
-        protectionSpaceServerTypeFromURI(soupURI, soup_auth_is_for_proxy(soupAuth)),
+    return ProtectionSpace(url.host().toString(), static_cast<int>(url.port().valueOr(0)),
+        protectionSpaceServerTypeFromURL(url, soup_auth_is_for_proxy(soupAuth)),
         String::fromUTF8(soup_auth_get_realm(soupAuth)), scheme);
 }
 
 AuthenticationChallenge::AuthenticationChallenge(SoupMessage* soupMessage, SoupAuth* soupAuth, bool retrying, AuthenticationClient* client)
-    : AuthenticationChallengeBase(protectionSpaceFromSoupAuthAndMessage(soupAuth, soupMessage),
-        Credential(), // proposedCredentials
-        retrying ? 1 : 0, // previousFailureCount
-        soupMessage, // failureResponse
-        ResourceError::authenticationError(soupMessage))
+    : AuthenticationChallengeBase(protectionSpaceFromSoupAuthAndURL(soupAuth, soupURIToURL(soup_message_get_uri(soupMessage)))
+        , Credential() // proposedCredentials
+        , retrying ? 1 : 0 // previousFailureCount
+        , soupMessage // failureResponse
+        , ResourceError::authenticationError(soupMessage))
     , m_soupMessage(soupMessage)
     , m_soupAuth(soupAuth)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] Reduce the use of SoupURI in preparation for libsoup3
+        https://bugs.webkit.org/show_bug.cgi?id=221251
+
+        Reviewed by Adrian Perez de Castro.
+
+        * UIProcess/API/glib/WebKitURISchemeRequest.cpp:
+        (webkit_uri_scheme_request_get_scheme):
+        (webkit_uri_scheme_request_get_path):
+        * UIProcess/API/glib/WebKitWebView.cpp:
+        (webkit_web_view_load_uri):
+
 2021-02-02  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp

@@ -27 +27 @@
 #include "WebKitWebView.h"
 #include "WebPageProxy.h"
-#include <WebCore/GUniquePtrSoup.h>
 #include <WebCore/HTTPParsers.h>
 #include <WebCore/MIMETypeRegistry.h>
 #include <WebCore/ResourceError.h>
-#include <WebCore/URLSoup.h>
-#include <libsoup/soup.h>
 #include <wtf/glib/GRefPtr.h>
 #include <wtf/glib/RunLoopSourcePriority.h>
@@ -65 +62 @@
     RefPtr<WebPageProxy> initiatingPage;
     CString uri;
-    GUniquePtr<SoupURI> soupURI;
+    CString uriScheme;
+    CString uriPath;
 
     GRefPtr<GInputStream> stream;
@@ -107 +105 @@
     g_return_val_if_fail(WEBKIT_IS_URI_SCHEME_REQUEST(request), nullptr);
 
-    if (!request->priv->soupURI)
-        request->priv->soupURI = urlToSoupURI(request->priv->task->request().url());
-
-    return request->priv->soupURI->scheme;
+    if (request->priv->uriScheme.isNull())
+        request->priv->uriScheme = request->priv->task->request().url().protocol().toString().utf8();
+
+    return request->priv->uriScheme.data();
 }
 
@@ -143 +141 @@
     g_return_val_if_fail(WEBKIT_IS_URI_SCHEME_REQUEST(request), nullptr);
 
-    if (!request->priv->soupURI)
-        request->priv->soupURI = urlToSoupURI(request->priv->task->request().url());
-
-    return request->priv->soupURI->path;
+    if (request->priv->uriPath.isNull())
+        request->priv->uriPath = request->priv->task->request().url().path().toString().utf8();
+
+    return request->priv->uriPath.data();
 }
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp

@@ -72 +72 @@
 #include <jsc/JSCContextPrivate.h>
 #include <WebCore/CertificateInfo.h>
-#include <WebCore/GUniquePtrSoup.h>
 #include <WebCore/JSDOMExceptionHandling.h>
 #include <WebCore/PlatformScreen.h>
 #include <WebCore/RefPtrCairo.h>
-#include <WebCore/URLSoup.h>
 #include <glib/gi18n-lib.h>
+#include <libsoup/soup.h>
 #include <wtf/SetForScope.h>
 #include <wtf/URL.h>
@@ -3021 +3020 @@
     g_return_if_fail(uri);
 
-    GUniquePtr<SoupURI> soupURI(soup_uri_new(uri));
-    getPage(webView).loadRequest(soupURIToURL(soupURI.get()));
+    getPage(webView).loadRequest(URL({ }, String::fromUTF8(uri)));
 }