Changeset 250242 in webkit

Timestamp:

Sep 23, 2019 11:00:22 AM (5 years ago)

Author:

Brent Fulgham

Message:

Unreviewed build fix after r250169 and r250236.

• NetworkProcess/curl/NetworkDataTaskCurl.cpp:

(WebKit::NetworkDataTaskCurl::createCurlRequest):

• UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp:

(WKWebsiteDataStoreEnableDefaultNetworkProxySettings):
(WKWebsiteDataStoreEnableCustomNetworkProxySettings):
(WKWebsiteDataStoreDisableNetworkProxySettings):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/curl/NetworkDataTaskCurl.cpp (modified) (1 diff)
• UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-23  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed build fix after r250169 and r250236.
+
+        * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
+        (WebKit::NetworkDataTaskCurl::createCurlRequest):
+        * UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp:
+        (WKWebsiteDataStoreEnableDefaultNetworkProxySettings):
+        (WKWebsiteDataStoreEnableCustomNetworkProxySettings):
+        (WKWebsiteDataStoreDisableNetworkProxySettings):
+
 2019-09-23  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp

@@ -129 +129 @@
     // Then, NetworkDataTaskCurl::resume() will be called and communication resumes.
     const auto captureMetrics = shouldCaptureExtraNetworkLoadMetrics() ? CurlRequest::CaptureNetworkLoadMetrics::Extended : CurlRequest::CaptureNetworkLoadMetrics::Basic;
-    return CurlRequest::create(request, *this, m_session->sessionID(), CurlRequest::ShouldSuspend::Yes, CurlRequest::EnableMultipart::No, captureMetrics);
+    return CurlRequest::create(request, *this, CurlRequest::ShouldSuspend::Yes, CurlRequest::EnableMultipart::No, captureMetrics);
 }
 

trunk/Source/WebKit/UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp

@@ -27 +27 @@
 #include "WKWebsiteDataStoreRefCurl.h"
 
-#include "APIWebsiteDataStore.h"
 #include "WKAPICast.h"
+#include "WebsiteDataStore.h"
 #include <WebCore/CurlProxySettings.h>
 #include <WebKit/WKWebsiteDataStoreRef.h>
@@ -37 +37 @@
 void WKWebsiteDataStoreEnableDefaultNetworkProxySettings(WKWebsiteDataStoreRef dataStoreRef)
 {
-    toImpl(dataStoreRef)->websiteDataStore().setNetworkProxySettings(WebCore::CurlProxySettings(WebCore::CurlProxySettings::Mode::Default));
+    toImpl(dataStoreRef)->setNetworkProxySettings(WebCore::CurlProxySettings(WebCore::CurlProxySettings::Mode::Default));
 }
 
 void WKWebsiteDataStoreEnableCustomNetworkProxySettings(WKWebsiteDataStoreRef dataStoreRef, WKURLRef proxyUrl, WKStringRef ignoreHosts)
 {
-    toImpl(dataStoreRef)->websiteDataStore().setNetworkProxySettings(WebCore::CurlProxySettings(URL(URL(), toWTFString(proxyUrl)), toWTFString(ignoreHosts)));
+    toImpl(dataStoreRef)->setNetworkProxySettings(WebCore::CurlProxySettings(URL(URL(), toWTFString(proxyUrl)), toWTFString(ignoreHosts)));
 }
 
 void WKWebsiteDataStoreDisableNetworkProxySettings(WKWebsiteDataStoreRef dataStoreRef)
 {
-    toImpl(dataStoreRef)->websiteDataStore().setNetworkProxySettings(WebCore::CurlProxySettings(WebCore::CurlProxySettings::Mode::NoProxy));
+    toImpl(dataStoreRef)->setNetworkProxySettings(WebCore::CurlProxySettings(WebCore::CurlProxySettings::Mode::NoProxy));
 }