WebKit Bugzilla
Attachment 357002 Details for
Bug 192571
: REGRESSION(r239023): Speculative rollout due to broken perf test (Requested by deanj on #webkit).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ROLLOUT of r239023
bug-192571-20181210145624.patch (text/plain), 21.77 KB, created by
WebKit Commit Bot
on 2018-12-10 14:56:25 PST
(
hide
)
Description:
ROLLOUT of r239023
Filename:
MIME Type:
Creator:
WebKit Commit Bot
Created:
2018-12-10 14:56:25 PST
Size:
21.77 KB
patch
obsolete
>Subversion Revision: 239053 >diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog >index 9fa99ca7d3ac7df234d9f6dc9f2afdc6a270c3d9..a88cd1aafb9534221bd31b8a8983049d93b68f29 100644 >--- a/Source/WebCore/PAL/ChangeLog >+++ b/Source/WebCore/PAL/ChangeLog >@@ -1,3 +1,18 @@ >+2018-12-10 Commit Queue <commit-queue@webkit.org> >+ >+ 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 <darin@apple.com> > > [macOS] MSHCreateMIGServerSource invocation does not handle send/receive rights correctly >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 5134476c8ddda02927029cd1fba5b1507dc9f5a1..59a34486c9b03fc31db93f5b89b935344863f587 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,18 @@ >+2018-12-10 Commit Queue <commit-queue@webkit.org> >+ >+ 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 <wenson_hsieh@apple.com> > > Unreviewed, fix the iOS build after r239039. >diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h >index aa26ecfdfe84ce0a52e64131e6800ae1acdb6469..876b1eaa6d746586930acf06071ec463f0dfa24a 100644 >--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h >+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h >@@ -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 @@ typedef void (*CFHTTPCookieStorageChangedProcPtr)(CFHTTPCookieStorageRef, void*) > 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); >diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp >index d7d660ad3b40d7235c3df4f1d1bbbee44ddfcce1..0b31ff7733dc24ca061cbdebe644bba9e013ac35 100644 >--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp >@@ -299,12 +299,7 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&& > 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); >diff --git a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp >index 2cb619039d1b13a0d795e6cea1aae3acde1f7593..b5a44849887d21b305032d6b4cfa9540b1c56e1a 100644 >--- a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp >@@ -42,7 +42,7 @@ NetworkSessionCreationParameters NetworkSessionCreationParameters::privateSessio > { > return { sessionID, { }, AllowsCellularAccess::Yes > #if PLATFORM(COCOA) >- , { }, { }, { }, false, { }, { }, { } >+ , { }, { }, { }, false, { } > #endif > #if USE(CURL) > , { } >@@ -61,8 +61,6 @@ void NetworkSessionCreationParameters::encode(IPC::Encoder& encoder) const > encoder << sourceApplicationSecondaryIdentifier; > encoder << shouldLogCookieInformation; > encoder << loadThrottleLatency; >- encoder << httpProxy; >- encoder << httpsProxy; > #endif > #if USE(CURL) > encoder << proxySettings; >@@ -109,16 +107,6 @@ std::optional<NetworkSessionCreationParameters> NetworkSessionCreationParameters > 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 @@ std::optional<NetworkSessionCreationParameters> NetworkSessionCreationParameters > , WTFMove(*sourceApplicationSecondaryIdentifier) > , WTFMove(*shouldLogCookieInformation) > , WTFMove(*loadThrottleLatency) >- , WTFMove(*httpProxy) >- , WTFMove(*httpsProxy) > #endif > #if USE(CURL) > , WTFMove(*proxySettings) >diff --git a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h >index 3227f7c87b0ade38667ec2bf06a693753f1d888f..27ce7b88d90eb4e685a9bb958944204ef2d7a096 100644 >--- a/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h >+++ b/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h >@@ -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 Encoder; > 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 @@ struct NetworkSessionCreationParameters { > String sourceApplicationSecondaryIdentifier; > bool shouldLogCookieInformation { false }; > Seconds loadThrottleLatency; >- URL httpProxy; >- URL httpsProxy; > #endif > #if USE(CURL) > WebCore::CurlProxySettings proxySettings; >diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm >index b88b5cee7099491ff2b369405ad43d70a47830e3..2d4a7fdb0b9c0b02921cc81ff6a73faa88bf4f61 100644 >--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm >+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm >@@ -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 @@ Ref<NetworkSession> NetworkSessionCocoa::create(NetworkSessionCreationParameters > 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 @@ NetworkSessionCocoa::NetworkSessionCocoa(NetworkSessionCreationParameters&& para > 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()) >diff --git a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm >index 8627df22a11ff629425236051a288ecc3b8df468..8b0e6fdea468631964e72bb7c3cb9fb0b23eb964 100644 >--- a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm >+++ b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm >@@ -65,6 +65,41 @@ void NetworkProcess::initializeProcessName(const ChildProcessInitializationParam > #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 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati > // 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) >diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm >index 2d160ea3b1288fe84dc1d8293c0a328381feb26a..74bf659abd6c5e81f8cb7deb3f5720813ce0c43b 100644 >--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm >+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm >@@ -214,10 +214,6 @@ static Vector<WebKit::WebsiteDataRecord> toWebsiteDataRecords(NSArray *dataRecor > 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()); > >diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h >index 4ec65cf922e155eb6e89fed7b629e59a319d0272..d08ddace0a5d38a4283bd37c62aae2495e8b6cd6 100644 >--- a/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h >+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h >@@ -43,8 +43,6 @@ WK_CLASS_AVAILABLE(macosx(10.13), ios(11.0)) > @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 > >diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm >index a9dcd25b7c9168e6ba03e5da124476e973bbbc26..1747bb15351d109771fa90c63dd99de7e66ba129 100644 >--- a/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm >+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm >@@ -71,26 +71,6 @@ static void checkURLArgument(NSURL *url) > _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]; >diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm >index d70286bdd3dc1cfc7b2551e7beeb25473e551311..d26406bc80acc3c5dbd023b8d070e6ba730aec08 100644 >--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm >+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm >@@ -69,6 +69,9 @@ NSString *WebKitJSCFTLJITEnabledDefaultsKey = @"WebKitJSCFTLJITEnabledDefaultsKe > 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 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara > > 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]; >diff --git a/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm b/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm >index 877edd4beaf4ee15c27dd0d24701c5f6bd437c64..4ded753f95593716e35dce162854f6123a5fc877 100644 >--- a/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm >+++ b/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm >@@ -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 @@ WebsiteDataStoreParameters WebsiteDataStore::parameters() > 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 @@ WebsiteDataStoreParameters WebsiteDataStore::parameters() > m_configuration->sourceApplicationBundleIdentifier(), > m_configuration->sourceApplicationSecondaryIdentifier(), > shouldLogCookieInformation, >- Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. }, >- WTFMove(httpProxy), >- WTFMove(httpsProxy), >+ Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. } > }; > > auto cookieFile = resolvedCookieStorageFile(); >diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp >index d87673311f2f4f20c60e0f48e7a1efd756ad76ef..3c09ddd67c4b985d780257735056e951c7c7f35e 100644 >--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp >+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp >@@ -57,8 +57,6 @@ Ref<WebsiteDataStoreConfiguration> WebsiteDataStoreConfiguration::copy() > 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; > } >diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h >index 832c3ec92b49ded1de5eb8a8a90590e83c6568a8..ebfaf5fe5ef589e5886e0c001313c01166bd0994 100644 >--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h >+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h >@@ -26,7 +26,6 @@ > #pragma once > > #include "APIObject.h" >-#include <wtf/URL.h> > #include <wtf/text/WTFString.h> > > namespace WebKit { >@@ -88,12 +87,6 @@ public: > 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 @@ private: > String m_cookieStorageFile; > String m_sourceApplicationBundleIdentifier; > String m_sourceApplicationSecondaryIdentifier; >- URL m_httpProxy; >- URL m_httpsProxy; > }; > > }
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=357002">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192571
: 357002