Title: [238777] trunk/Source/WebKit
- Revision
- 238777
- Author
- [email protected]
- Date
- 2018-11-30 22:17:55 -0800 (Fri, 30 Nov 2018)
Log Message
Fix Windows build.
* UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp:
(WKWebsiteDataStoreEnableCustomNetworkProxySettings):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (238776 => 238777)
--- trunk/Source/WebKit/ChangeLog 2018-12-01 05:58:58 UTC (rev 238776)
+++ trunk/Source/WebKit/ChangeLog 2018-12-01 06:17:55 UTC (rev 238777)
@@ -1,5 +1,12 @@
2018-11-30 Alex Christensen <[email protected]>
+ Fix Windows build.
+
+ * UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp:
+ (WKWebsiteDataStoreEnableCustomNetworkProxySettings):
+
+2018-11-30 Alex Christensen <[email protected]>
+
Move URL from WebCore to WTF
https://bugs.webkit.org/show_bug.cgi?id=190234
Modified: trunk/Source/WebKit/UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp (238776 => 238777)
--- trunk/Source/WebKit/UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp 2018-12-01 05:58:58 UTC (rev 238776)
+++ trunk/Source/WebKit/UIProcess/API/C/curl/WKWebsiteDataStoreRefCurl.cpp 2018-12-01 06:17:55 UTC (rev 238777)
@@ -29,8 +29,8 @@
#include "APIWebsiteDataStore.h"
#include "WKAPICast.h"
#include <WebCore/CurlProxySettings.h>
-#include <WebCore/URL.h>
#include <WebKit/WKWebsiteDataStoreRef.h>
+#include <wtf/URL.h>
using namespace WebKit;
@@ -41,7 +41,7 @@
void WKWebsiteDataStoreEnableCustomNetworkProxySettings(WKWebsiteDataStoreRef dataStoreRef, WKURLRef proxyUrl, WKStringRef ignoreHosts)
{
- toImpl(dataStoreRef)->websiteDataStore().setNetworkProxySettings(WebCore::CurlProxySettings(WebCore::URL(WebCore::URL(), toWTFString(proxyUrl)), toWTFString(ignoreHosts)));
+ toImpl(dataStoreRef)->websiteDataStore().setNetworkProxySettings(WebCore::CurlProxySettings(URL(URL(), toWTFString(proxyUrl)), toWTFString(ignoreHosts)));
}
void WKWebsiteDataStoreDisableNetworkProxySettings(WKWebsiteDataStoreRef dataStoreRef)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
