Attachment 348028 Details for Bug 188922 – PATCH

[patch] PATCH

188922.diff (text/plain), 4.68 KB, created by Basuke Suzuki on 2018-08-24 11:29:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-08-24 11:29:42 PDT

Size: 4.68 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 100f12ce604..ade478a550d 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-24  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Match the interface used in NetworkDataTask and ResourceHandle.
>+        https://bugs.webkit.org/show_bug.cgi?id=188922
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The interfaces for NetworkDataTask and ResourceHandle are diverged.
>+        It should be same for the same purpose because they do same thing.
>+
>+        No change in behavior.
>+
>+        * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
>+        (WebKit::NetworkDataTaskCurl::NetworkDataTaskCurl):
>+        (WebKit::NetworkDataTaskCurl::createCurlRequest):
>+        (WebKit::NetworkDataTaskCurl::willPerformHTTPRedirection):
>+        (WebKit::NetworkDataTaskCurl::restartWithCredential):
>+        * NetworkProcess/curl/NetworkDataTaskCurl.h:
>+
> 2018-08-20  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [CMake] Sync unified build with Cocoa ports
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>index 4cf70ec59d8..b0623e3733d 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>@@ -61,7 +61,7 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas
>         }
>     }
> 
>-    m_curlRequest = createCurlRequest(request, ShouldPreprocess::Yes);
>+    m_curlRequest = createCurlRequest(request);
>     if (!m_initialCredential.isEmpty())
>         m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password());
>     m_curlRequest->start();
>@@ -126,11 +126,11 @@ NetworkDataTask::State NetworkDataTaskCurl::state() const
>     return m_state;
> }
> 
>-Ref<CurlRequest> NetworkDataTaskCurl::createCurlRequest(const ResourceRequest& request, ShouldPreprocess shouldPreprocess)
>+Ref<CurlRequest> NetworkDataTaskCurl::createCurlRequest(const ResourceRequest& request, RequestStatus status)
> {
>     m_currentRequest = request;
> 
>-    if (shouldPreprocess == ShouldPreprocess::Yes)
>+    if (status == RequestStatus::NewRequest)
>         appendCookieHeader(m_currentRequest);
> 
>     // Creates a CurlRequest in suspended state.
>@@ -295,7 +295,7 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection()
>         if (m_curlRequest)
>             m_curlRequest->cancel();
> 
>-        m_curlRequest = createCurlRequest(newRequest, ShouldPreprocess::Yes);
>+        m_curlRequest = createCurlRequest(newRequest);
>         if (didChangeCredential && !m_initialCredential.isEmpty())
>             m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password());
>         m_curlRequest->start();
>@@ -365,7 +365,7 @@ void NetworkDataTaskCurl::restartWithCredential(const Credential& credential)
>     if (m_curlRequest)
>         m_curlRequest->cancel();
> 
>-    m_curlRequest = createCurlRequest(m_currentRequest, ShouldPreprocess::No);
>+    m_curlRequest = createCurlRequest(m_currentRequest, RequestStatus::ReusedRequest);
>     if (!credential.isEmpty())
>         m_curlRequest->setUserPass(credential.user(), credential.password());
>     m_curlRequest->start();
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
>index 8432e4cbf80..d955f9a0836 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
>@@ -49,9 +49,9 @@ public:
>     void deref() override { RefCounted<NetworkDataTask>::deref(); }
> 
> private:
>-    enum class ShouldPreprocess : bool {
>-        No = false,
>-        Yes = true
>+    enum class RequestStatus {
>+        NewRequest,
>+        ReusedRequest
>     };
> 
>     NetworkDataTaskCurl(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation);
>@@ -62,7 +62,7 @@ private:
>     void invalidateAndCancel() override;
>     NetworkDataTask::State state() const override;
> 
>-    Ref<WebCore::CurlRequest> createCurlRequest(const WebCore::ResourceRequest&, ShouldPreprocess);
>+    Ref<WebCore::CurlRequest> createCurlRequest(const WebCore::ResourceRequest&, RequestStatus = RequestStatus::NewRequest);
>     void curlDidSendData(WebCore::CurlRequest&, unsigned long long, unsigned long long) override;
>     void curlDidReceiveResponse(WebCore::CurlRequest&, const WebCore::CurlResponse&) override;
>     void curlDidReceiveBuffer(WebCore::CurlRequest&, Ref<WebCore::SharedBuffer>&&) override;

Actions: View | Formatted Diff | Diff

Attachments on bug 188922: 348028