Changeset 250192 in webkit

Timestamp:

Sep 21, 2019 10:15:45 PM (5 years ago)

Author:

Chris Dumez

Message:

[CURL] CurlRequest does not need a sessionID
​https://bugs.webkit.org/show_bug.cgi?id=202086

Reviewed by Alex Christensen.

• platform/network/curl/CurlFormDataStream.cpp:

(WebCore::CurlFormDataStream::CurlFormDataStream):

• platform/network/curl/CurlFormDataStream.h:
• platform/network/curl/CurlRequest.cpp:

(WebCore::CurlRequest::CurlRequest):

• platform/network/curl/CurlRequest.h:

(WebCore::CurlRequest::create):

• platform/network/curl/ResourceHandleCurl.cpp:

(WebCore::ResourceHandle::createCurlRequest):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CurlFormDataStream.cpp (modified) (1 diff)
• platform/network/curl/CurlFormDataStream.h (modified) (2 diffs)
• platform/network/curl/CurlRequest.cpp (modified) (2 diffs)
• platform/network/curl/CurlRequest.h (modified) (3 diffs)
• platform/network/curl/ResourceHandleCurl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-21  Chris Dumez  <cdumez@apple.com>
+
+        [CURL] CurlRequest does not need a sessionID
+        https://bugs.webkit.org/show_bug.cgi?id=202086
+
+        Reviewed by Alex Christensen.
+
+        * platform/network/curl/CurlFormDataStream.cpp:
+        (WebCore::CurlFormDataStream::CurlFormDataStream):
+        * platform/network/curl/CurlFormDataStream.h:
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::CurlRequest):
+        * platform/network/curl/CurlRequest.h:
+        (WebCore::CurlRequest::create):
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        (WebCore::ResourceHandle::createCurlRequest):
+
 2019-09-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp

@@ -42 +42 @@
 namespace WebCore {
 
-CurlFormDataStream::CurlFormDataStream(const FormData* formData, PAL::SessionID sessionID)
-    : m_sessionID(sessionID)
+CurlFormDataStream::CurlFormDataStream(const FormData* formData)
 {
     ASSERT(isMainThread());

trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.h

@@ -35 +35 @@
 class CurlFormDataStream {
 public:
-    CurlFormDataStream(const FormData*, PAL::SessionID);
+    explicit CurlFormDataStream(const FormData*);
     WEBCORE_EXPORT ~CurlFormDataStream();
 
@@ -55 +55 @@
     Optional<size_t> readFromData(const Vector<char>&, char*, size_t);
 
-    PAL::SessionID m_sessionID;
     RefPtr<FormData> m_formData;
 

trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp

@@ -42 +42 @@
 namespace WebCore {
 
-CurlRequest::CurlRequest(const ResourceRequest&request, CurlRequestClient* client, PAL::SessionID sessionID, ShouldSuspend shouldSuspend, EnableMultipart enableMultipart, CaptureNetworkLoadMetrics captureExtraMetrics, MessageQueue<Function<void()>>* messageQueue)
+CurlRequest::CurlRequest(const ResourceRequest&request, CurlRequestClient* client, ShouldSuspend shouldSuspend, EnableMultipart enableMultipart, CaptureNetworkLoadMetrics captureExtraMetrics, MessageQueue<Function<void()>>* messageQueue)
     : m_client(client)
     , m_messageQueue(messageQueue)
@@ -48 +48 @@
     , m_shouldSuspend(shouldSuspend == ShouldSuspend::Yes)
     , m_enableMultipart(enableMultipart == EnableMultipart::Yes)
-    , m_formDataStream(m_request.httpBody(), sessionID)
+    , m_formDataStream(m_request.httpBody())
     , m_captureExtraMetrics(captureExtraMetrics == CaptureNetworkLoadMetrics::Extended)
 {

trunk/Source/WebCore/platform/network/curl/CurlRequest.h

@@ -33 +33 @@
 #include "ProtectionSpace.h"
 #include "ResourceRequest.h"
-#include <pal/SessionID.h>
 #include <wtf/FileSystem.h>
 #include <wtf/MessageQueue.h>
@@ -65 +64 @@
     };
 
-    static Ref<CurlRequest> create(const ResourceRequest& request, CurlRequestClient& client, PAL::SessionID sessionID, ShouldSuspend shouldSuspend = ShouldSuspend::No, EnableMultipart enableMultipart = EnableMultipart::No, CaptureNetworkLoadMetrics captureMetrics = CaptureNetworkLoadMetrics::Basic, MessageQueue<Function<void()>>* messageQueue = nullptr)
+    static Ref<CurlRequest> create(const ResourceRequest& request, CurlRequestClient& client, ShouldSuspend shouldSuspend = ShouldSuspend::No, EnableMultipart enableMultipart = EnableMultipart::No, CaptureNetworkLoadMetrics captureMetrics = CaptureNetworkLoadMetrics::Basic, MessageQueue<Function<void()>>* messageQueue = nullptr)
     {
-        return adoptRef(*new CurlRequest(request, &client, sessionID, shouldSuspend, enableMultipart, captureMetrics, messageQueue));
+        return adoptRef(*new CurlRequest(request, &client, shouldSuspend, enableMultipart, captureMetrics, messageQueue));
     }
 
@@ -107 +106 @@
     };
 
-    CurlRequest(const ResourceRequest&, CurlRequestClient*, PAL::SessionID, ShouldSuspend, EnableMultipart, CaptureNetworkLoadMetrics, MessageQueue<Function<void()>>*);
+    CurlRequest(const ResourceRequest&, CurlRequestClient*, ShouldSuspend, EnableMultipart, CaptureNetworkLoadMetrics, MessageQueue<Function<void()>>*);
 
     void retain() override { ref(); }

trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp

@@ -155 +155 @@
 
     CurlRequest::ShouldSuspend shouldSuspend = d->m_defersLoading ? CurlRequest::ShouldSuspend::Yes : CurlRequest::ShouldSuspend::No;
-    // FIXME: Use a correct sessionID.
-    auto curlRequest = CurlRequest::create(request, *delegate(), PAL::SessionID::defaultSessionID(), shouldSuspend, CurlRequest::EnableMultipart::Yes, CurlRequest::CaptureNetworkLoadMetrics::Basic, d->m_messageQueue);
+    auto curlRequest = CurlRequest::create(request, *delegate(), shouldSuspend, CurlRequest::EnableMultipart::Yes, CurlRequest::CaptureNetworkLoadMetrics::Basic, d->m_messageQueue);
     
     return curlRequest;