Title: [250242] trunk/Source/WebKit
- Revision
- 250242
- Author
- bfulg...@apple.com
- Date
- 2019-09-23 11:00:22 -0700 (Mon, 23 Sep 2019)
Log Message
Unreviewed build fix after r250169 and r250236.
* NetworkProcess/curl/NetworkDataTaskCurl.cpp:
(WebKit::NetworkDataTaskCurl::createCurlRequest):
* UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp:
(WKWebsiteDataStoreEnableDefaultNetworkProxySettings):
(WKWebsiteDataStoreEnableCustomNetworkProxySettings):
(WKWebsiteDataStoreDisableNetworkProxySettings):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (250241 => 250242)
--- trunk/Source/WebKit/ChangeLog 2019-09-23 17:53:39 UTC (rev 250241)
+++ trunk/Source/WebKit/ChangeLog 2019-09-23 18:00:22 UTC (rev 250242)
@@ -1,3 +1,14 @@
+2019-09-23 Brent Fulgham <bfulg...@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 <ddkil...@apple.com>
clang-tidy: Fix unnecessary copy/ref churn of for loop variables in WebKit
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp (250241 => 250242)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2019-09-23 17:53:39 UTC (rev 250241)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2019-09-23 18:00:22 UTC (rev 250242)
@@ -128,7 +128,7 @@
// Creates a CurlRequest in suspended state.
// 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);
}
void NetworkDataTaskCurl::curlDidSendData(CurlRequest&, unsigned long long totalBytesSent, unsigned long long totalBytesExpectedToSend)
Modified: trunk/Source/WebKit/UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp (250241 => 250242)
--- trunk/Source/WebKit/UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp 2019-09-23 17:53:39 UTC (rev 250241)
+++ trunk/Source/WebKit/UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp 2019-09-23 18:00:22 UTC (rev 250242)
@@ -26,8 +26,8 @@
#include "config.h"
#include "WKWebsiteDataStoreRefCurl.h"
-#include "APIWebsiteDataStore.h"
#include "WKAPICast.h"
+#include "WebsiteDataStore.h"
#include <WebCore/CurlProxySettings.h>
#include <WebKit/WKWebsiteDataStoreRef.h>
#include <wtf/URL.h>
@@ -36,15 +36,15 @@
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));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
