Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (239055 => 239056)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-12-10 23:36:36 UTC (rev 239056)
@@ -1,3 +1,18 @@
+2018-12-10 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r239023.
+ https://bugs.webkit.org/show_bug.cgi?id=192571
+
+ Speculative rollout due to broken perf test (Requested by
+ deanj on #webkit).
+
+ Reverted changeset:
+
+ "Enable HTTP and HTTPS proxies on iOS and make it a property
+ of the NSURLSession"
+ https://bugs.webkit.org/show_bug.cgi?id=192374
+ https://trac.webkit.org/changeset/239023
+
2018-12-10 Darin Adler <[email protected]>
[macOS] MSHCreateMIGServerSource invocation does not handle send/receive rights correctly
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (239055 => 239056)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-12-10 23:36:36 UTC (rev 239056)
@@ -33,7 +33,6 @@
#if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
#include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <CFNetwork/CFHTTPStream.h>
#include <CFNetwork/CFProxySupportPriv.h>
#include <CFNetwork/CFURLCachePriv.h>
#include <CFNetwork/CFURLConnectionPriv.h>
@@ -266,6 +265,7 @@
void CFHTTPCookieStorageAddObserver(CFHTTPCookieStorageRef, CFRunLoopRef, CFStringRef, CFHTTPCookieStorageChangedProcPtr, void*);
void CFHTTPCookieStorageRemoveObserver(CFHTTPCookieStorageRef, CFRunLoopRef, CFStringRef, CFHTTPCookieStorageChangedProcPtr, void*);
+void _CFNetworkSetOverrideSystemProxySettings(CFDictionaryRef);
CFURLCredentialStorageRef CFURLCredentialStorageCreate(CFAllocatorRef);
CFURLCredentialRef CFURLCredentialStorageCopyDefaultCredentialForProtectionSpace(CFURLCredentialStorageRef, CFURLProtectionSpaceRef);
CFURLRequestPriority CFURLRequestGetRequestPriority(CFURLRequestRef);
Modified: trunk/Source/WebKit/ChangeLog (239055 => 239056)
--- trunk/Source/WebKit/ChangeLog 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/ChangeLog 2018-12-10 23:36:36 UTC (rev 239056)
@@ -1,3 +1,18 @@
+2018-12-10 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r239023.
+ https://bugs.webkit.org/show_bug.cgi?id=192571
+
+ Speculative rollout due to broken perf test (Requested by
+ deanj on #webkit).
+
+ Reverted changeset:
+
+ "Enable HTTP and HTTPS proxies on iOS and make it a property
+ of the NSURLSession"
+ https://bugs.webkit.org/show_bug.cgi?id=192374
+ https://trac.webkit.org/changeset/239023
+
2018-12-10 Wenson Hsieh <[email protected]>
Unreviewed, fix the iOS build after r239039.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (239055 => 239056)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-12-10 23:36:36 UTC (rev 239056)
@@ -299,12 +299,7 @@
if (parameters.shouldUseTestingNetworkSession)
NetworkStorageSession::switchToNewTestingSession();
- NetworkSessionCreationParameters sessionCreationParameters { };
-#if PLATFORM(COCOA)
- sessionCreationParameters.httpProxy = URL(URL(), parameters.httpProxy);
- sessionCreationParameters.httpsProxy = URL(URL(), parameters.httpsProxy);
-#endif
- SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(sessionCreationParameters)));
+ SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(NetworkSessionCreationParameters()));
#if ENABLE(INDEXED_DATABASE)
addIndexedDatabaseSession(PAL::SessionID::defaultSessionID(), parameters.indexedDatabaseDirectory, parameters.indexedDatabaseDirectoryExtensionHandle);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp (239055 => 239056)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2018-12-10 23:36:36 UTC (rev 239056)
@@ -42,7 +42,7 @@
{
return { sessionID, { }, AllowsCellularAccess::Yes
#if PLATFORM(COCOA)
- , { }, { }, { }, false, { }, { }, { }
+ , { }, { }, { }, false, { }
#endif
#if USE(CURL)
, { }
@@ -61,8 +61,6 @@
encoder << sourceApplicationSecondaryIdentifier;
encoder << shouldLogCookieInformation;
encoder << loadThrottleLatency;
- encoder << httpProxy;
- encoder << httpsProxy;
#endif
#if USE(CURL)
encoder << proxySettings;
@@ -109,16 +107,6 @@
decoder >> loadThrottleLatency;
if (!loadThrottleLatency)
return std::nullopt;
-
- std::optional<URL> httpProxy;
- decoder >> httpProxy;
- if (!httpProxy)
- return std::nullopt;
-
- std::optional<URL> httpsProxy;
- decoder >> httpsProxy;
- if (!httpsProxy)
- return std::nullopt;
#endif
#if USE(CURL)
@@ -138,8 +126,6 @@
, WTFMove(*sourceApplicationSecondaryIdentifier)
, WTFMove(*shouldLogCookieInformation)
, WTFMove(*loadThrottleLatency)
- , WTFMove(*httpProxy)
- , WTFMove(*httpsProxy)
#endif
#if USE(CURL)
, WTFMove(*proxySettings)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (239055 => 239056)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2018-12-10 23:36:36 UTC (rev 239056)
@@ -27,7 +27,6 @@
#include <pal/SessionID.h>
#include <wtf/Seconds.h>
-#include <wtf/URL.h>
#include <wtf/text/WTFString.h>
#if USE(CURL)
@@ -39,11 +38,6 @@
class Decoder;
}
-#if PLATFORM(COCOA)
-extern "C" CFStringRef const WebKit2HTTPProxyDefaultsKey;
-extern "C" CFStringRef const WebKit2HTTPSProxyDefaultsKey;
-#endif
-
namespace WebKit {
enum class AllowsCellularAccess : bool { No, Yes };
@@ -62,8 +56,6 @@
String sourceApplicationSecondaryIdentifier;
bool shouldLogCookieInformation { false };
Seconds loadThrottleLatency;
- URL httpProxy;
- URL httpsProxy;
#endif
#if USE(CURL)
WebCore::CurlProxySettings proxySettings;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (239055 => 239056)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-12-10 23:36:36 UTC (rev 239056)
@@ -55,9 +55,6 @@
using namespace WebKit;
-CFStringRef const WebKit2HTTPProxyDefaultsKey = static_cast<CFStringRef>(@"WebKit2HTTPProxy");
-CFStringRef const WebKit2HTTPSProxyDefaultsKey = static_cast<CFStringRef>(@"WebKit2HTTPSProxy");
-
static NSURLSessionResponseDisposition toNSURLSessionResponseDisposition(WebCore::PolicyAction disposition)
{
switch (disposition) {
@@ -607,29 +604,6 @@
return adoptRef(*new NetworkSessionCocoa(WTFMove(parameters)));
}
-static NSDictionary *proxyDictionary(const URL& httpProxy, const URL& httpsProxy)
-{
- if (!httpProxy.isValid() && !httpsProxy.isValid())
- return nil;
-
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-
- NSMutableDictionary *dictionary = [[[NSMutableDictionary alloc] init] autorelease];
- if (httpProxy.isValid()) {
- [dictionary setObject:httpProxy.host().toString() forKey:(NSString *)kCFStreamPropertyHTTPProxyHost];
- if (auto port = httpProxy.port())
- [dictionary setObject:@(*port) forKey:(NSString *)kCFStreamPropertyHTTPProxyHost];
- }
- if (httpsProxy.isValid()) {
- [dictionary setObject:httpsProxy.host().toString() forKey:(NSString *)kCFStreamPropertyHTTPSProxyHost];
- if (auto port = httpsProxy.port())
- [dictionary setObject:@(*port) forKey:(NSString *)kCFStreamPropertyHTTPSProxyPort];
- }
- return dictionary;
-
- ALLOW_DEPRECATED_DECLARATIONS_END
-}
-
NetworkSessionCocoa::NetworkSessionCocoa(NetworkSessionCreationParameters&& parameters)
: NetworkSession(parameters.sessionID)
, m_boundInterfaceIdentifier(parameters.boundInterfaceIdentifier)
@@ -669,8 +643,6 @@
if (!parameters.sourceApplicationSecondaryIdentifier.isEmpty())
configuration._sourceApplicationSecondaryIdentifier = parameters.sourceApplicationSecondaryIdentifier;
- configuration.connectionProxyDictionary = proxyDictionary(parameters.httpProxy, parameters.httpsProxy);
-
#if PLATFORM(IOS_FAMILY)
auto& ctDataConnectionServiceType = globalCTDataConnectionServiceType();
if (!ctDataConnectionServiceType.isEmpty())
Modified: trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm (239055 => 239056)
--- trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-12-10 23:36:36 UTC (rev 239056)
@@ -65,6 +65,41 @@
#endif
}
+static void overrideSystemProxies(const String& httpProxy, const String& httpsProxy)
+{
+ NSMutableDictionary *proxySettings = [NSMutableDictionary dictionary];
+
+ if (!httpProxy.isNull()) {
+ URL httpProxyURL(URL(), httpProxy);
+ if (httpProxyURL.isValid()) {
+ [proxySettings setObject:nsStringFromWebCoreString(httpProxyURL.host().toString()) forKey:(NSString *)kCFNetworkProxiesHTTPProxy];
+ if (httpProxyURL.port()) {
+ NSNumber *port = [NSNumber numberWithInt:httpProxyURL.port().value()];
+ [proxySettings setObject:port forKey:(NSString *)kCFNetworkProxiesHTTPPort];
+ }
+ }
+ else
+ NSLog(@"Malformed HTTP Proxy URL '%s'. Expected 'http://<hostname>[:<port>]'\n", httpProxy.utf8().data());
+ }
+
+ if (!httpsProxy.isNull()) {
+ URL httpsProxyURL(URL(), httpsProxy);
+ if (httpsProxyURL.isValid()) {
+#if !PLATFORM(IOSMAC)
+ [proxySettings setObject:nsStringFromWebCoreString(httpsProxyURL.host().toString()) forKey:(NSString *)kCFNetworkProxiesHTTPSProxy];
+ if (httpsProxyURL.port()) {
+ NSNumber *port = [NSNumber numberWithInt:httpsProxyURL.port().value()];
+ [proxySettings setObject:port forKey:(NSString *)kCFNetworkProxiesHTTPSPort];
+ }
+#endif
+ } else
+ NSLog(@"Malformed HTTPS Proxy URL '%s'. Expected 'https://<hostname>[:<port>]'\n", httpsProxy.utf8().data());
+ }
+
+ if ([proxySettings count] > 0)
+ _CFNetworkSetOverrideSystemProxySettings((__bridge CFDictionaryRef)proxySettings);
+}
+
void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
{
platformInitializeNetworkProcessCocoa(parameters);
@@ -73,6 +108,9 @@
// SecItemShim is needed for CFNetwork APIs that query Keychains beneath us.
initializeSecItemShim(*this);
#endif
+
+ if (!parameters.httpProxy.isNull() || !parameters.httpsProxy.isNull())
+ overrideSystemProxies(parameters.httpProxy, parameters.httpsProxy);
}
void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (239055 => 239056)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2018-12-10 23:36:36 UTC (rev 239056)
@@ -214,10 +214,6 @@
config->setSourceApplicationBundleIdentifier(configuration.sourceApplicationBundleIdentifier);
if (configuration.sourceApplicationSecondaryIdentifier)
config->setSourceApplicationSecondaryIdentifier(configuration.sourceApplicationSecondaryIdentifier);
- if (configuration.httpProxy)
- config->setHTTPProxy(configuration.httpProxy);
- if (configuration.httpsProxy)
- config->setHTTPSProxy(configuration.httpsProxy);
API::Object::constructInWrapper<API::WebsiteDataStore>(self, WTFMove(config), PAL::SessionID::generatePersistentSessionID());
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h (239055 => 239056)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2018-12-10 23:36:36 UTC (rev 239056)
@@ -43,8 +43,6 @@
@property (nonatomic, copy, setter=_setServiceWorkerRegistrationDirectory:) NSURL *_serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
@property (nonatomic, nullable, copy) NSString *sourceApplicationBundleIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, nullable, copy) NSString *sourceApplicationSecondaryIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-@property (nonatomic, nullable, copy, setter=setHTTPProxy:) NSURL *httpProxy WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-@property (nonatomic, nullable, copy, setter=setHTTPSProxy:) NSURL *httpsProxy WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm (239055 => 239056)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm 2018-12-10 23:36:36 UTC (rev 239056)
@@ -71,26 +71,6 @@
_configuration->setWebSQLDatabaseDirectory(url.path);
}
-- (NSURL *)httpProxy
-{
- return _configuration->httpProxy();
-}
-
-- (void)setHTTPProxy:(NSURL *)proxy
-{
- _configuration->setHTTPProxy(proxy);
-}
-
-- (NSURL *)httpsProxy
-{
- return _configuration->httpsProxy();
-}
-
-- (void)setHTTPSProxy:(NSURL *)proxy
-{
- _configuration->setHTTPSProxy(proxy);
-}
-
- (NSURL *)_cookieStorageFile
{
return [NSURL fileURLWithPath:_configuration->cookieStorageFile() isDirectory:NO];
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (239055 => 239056)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-12-10 23:36:36 UTC (rev 239056)
@@ -69,6 +69,9 @@
static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
#endif
+static NSString * const WebKit2HTTPProxyDefaultsKey = @"WebKit2HTTPProxy";
+static NSString * const WebKit2HTTPSProxyDefaultsKey = @"WebKit2HTTPSProxy";
+
static NSString * const WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey = @"WebKitNetworkCacheEfficacyLoggingEnabled";
static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @"WebKitSuppressMemoryPressureHandler";
@@ -256,19 +259,8 @@
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- {
- bool isSafari = false;
-#if PLATFORM(IOS_FAMILY)
- isSafari = WebCore::IOSApplication::isMobileSafari();
-#elif PLATFORM(MAC)
- isSafari = WebCore::MacApplication::isSafari();
-#endif
- if (isSafari) {
- parameters.httpProxy = [defaults stringForKey:(NSString *)WebKit2HTTPProxyDefaultsKey];
- parameters.httpsProxy = [defaults stringForKey:(NSString *)WebKit2HTTPSProxyDefaultsKey];
- }
- }
-
+ parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey];
+ parameters.httpsProxy = [defaults stringForKey:WebKit2HTTPSProxyDefaultsKey];
parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (239055 => 239056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2018-12-10 23:36:36 UTC (rev 239056)
@@ -31,7 +31,6 @@
#import "WebResourceLoadStatisticsStore.h"
#import "WebsiteDataStoreParameters.h"
#import <WebCore/FileSystem.h>
-#import <WebCore/RuntimeApplicationChecks.h>
#import <WebCore/SearchPopupMenuCocoa.h>
#import <pal/spi/cf/CFNetworkSPI.h>
#import <wtf/NeverDestroyed.h>
@@ -68,21 +67,6 @@
bool shouldLogCookieInformation = false;
#endif
- URL httpProxy = m_configuration->httpProxy();
- URL httpsProxy = m_configuration->httpsProxy();
-
- bool isSafari = false;
-#if PLATFORM(IOS_FAMILY)
- isSafari = WebCore::IOSApplication::isMobileSafari();
-#elif PLATFORM(MAC)
- isSafari = WebCore::MacApplication::isSafari();
-#endif
- // FIXME: Remove these once Safari adopts _WKWebsiteDataStoreConfiguration.httpProxy and .httpsProxy.
- if (!httpProxy.isValid() && isSafari)
- httpProxy = URL(URL(), [defaults stringForKey:(NSString *)WebKit2HTTPProxyDefaultsKey]);
- if (!httpsProxy.isValid() && isSafari)
- httpsProxy = URL(URL(), [defaults stringForKey:(NSString *)WebKit2HTTPSProxyDefaultsKey]);
-
WebsiteDataStoreParameters parameters;
parameters.networkSessionParameters = {
m_sessionID,
@@ -92,9 +76,7 @@
m_configuration->sourceApplicationBundleIdentifier(),
m_configuration->sourceApplicationSecondaryIdentifier(),
shouldLogCookieInformation,
- Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. },
- WTFMove(httpProxy),
- WTFMove(httpsProxy),
+ Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. }
};
auto cookieFile = resolvedCookieStorageFile();
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (239055 => 239056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2018-12-10 23:36:36 UTC (rev 239056)
@@ -57,8 +57,6 @@
copy->m_cookieStorageFile = this->m_cookieStorageFile;
copy->m_sourceApplicationBundleIdentifier = this->m_sourceApplicationBundleIdentifier;
copy->m_sourceApplicationSecondaryIdentifier = this->m_sourceApplicationSecondaryIdentifier;
- copy->m_httpProxy = this->m_httpProxy;
- copy->m_httpsProxy = this->m_httpsProxy;
return copy;
}
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (239055 => 239056)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2018-12-10 23:14:31 UTC (rev 239055)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2018-12-10 23:36:36 UTC (rev 239056)
@@ -26,7 +26,6 @@
#pragma once
#include "APIObject.h"
-#include <wtf/URL.h>
#include <wtf/text/WTFString.h>
namespace WebKit {
@@ -88,12 +87,6 @@
const String& sourceApplicationSecondaryIdentifier() const { return m_sourceApplicationSecondaryIdentifier; }
void setSourceApplicationSecondaryIdentifier(String&& identifier) { m_sourceApplicationSecondaryIdentifier = WTFMove(identifier); }
- const URL& httpProxy() const { return m_httpProxy; }
- void setHTTPProxy(URL&& proxy) { m_httpProxy = WTFMove(proxy); }
-
- const URL& httpsProxy() const { return m_httpsProxy; }
- void setHTTPSProxy(URL&& proxy) { m_httpsProxy = WTFMove(proxy); }
-
constexpr static uint64_t defaultCacheStoragePerOriginQuota = 50 * 1024 * 1024;
private:
@@ -117,8 +110,6 @@
String m_cookieStorageFile;
String m_sourceApplicationBundleIdentifier;
String m_sourceApplicationSecondaryIdentifier;
- URL m_httpProxy;
- URL m_httpsProxy;
};
}
