Diff
Modified: trunk/Source/WebKit/ChangeLog (252818 => 252819)
--- trunk/Source/WebKit/ChangeLog 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/ChangeLog 2019-11-23 01:13:18 UTC (rev 252819)
@@ -1,5 +1,18 @@
2019-11-22 Alex Christensen <[email protected]>
+ Unreviewed, rolling out r252796.
+
+ Turns out my reverting earlier today wasn't so necessary after all.
+ This is effectively re-landing r250422.
+
+ Reverted changeset:
+
+ "Revert r250422"
+ https://bugs.webkit.org/show_bug.cgi?id=202285
+ https://trac.webkit.org/changeset/252796
+
+2019-11-22 Alex Christensen <[email protected]>
+
Unreviewed, rolling out r252798.
Turns out my reverting earlier today wasn't so necessary after all.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (252818 => 252819)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-11-23 01:13:18 UTC (rev 252819)
@@ -306,8 +306,6 @@
setCacheModel(parameters.cacheModel, parameters.defaultDataStoreParameters.networkSessionParameters.networkCacheDirectory);
- setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
-
#if ENABLE(RESOURCE_LOAD_STATISTICS)
m_isITPDatabaseEnabled = parameters.shouldEnableITPDatabase;
#endif
@@ -2201,11 +2199,6 @@
LegacySchemeRegistry::registerURLSchemeAsNoAccess(scheme);
}
-void NetworkProcess::setCanHandleHTTPSServerTrustEvaluation(bool value)
-{
- m_canHandleHTTPSServerTrustEvaluation = value;
-}
-
void NetworkProcess::didSyncAllCookies()
{
parentProcessConnection()->send(Messages::NetworkProcessProxy::DidSyncAllCookies(), 0);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (252818 => 252819)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-11-23 01:13:18 UTC (rev 252819)
@@ -174,8 +174,6 @@
void ensureSession(const PAL::SessionID&, bool shouldUseTestingNetworkSession, const String& identifier);
#endif
- bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
-
void processWillSuspendImminentlyForTestingSync(CompletionHandler<void()>&&);
void prepareToSuspend(bool isSuspensionImminent, CompletionHandler<void()>&&);
void processDidResume();
@@ -412,7 +410,6 @@
void setCacheModel(CacheModel, String overrideCacheStorageDirectory);
void setCacheModelSynchronouslyForTesting(CacheModel, CompletionHandler<void()>&&);
void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
- void setCanHandleHTTPSServerTrustEvaluation(bool);
void clearCacheForAllOrigins(uint32_t cachesToClear);
void setAllowsAnySSLCertificateForWebSocket(bool, CompletionHandler<void()>&&);
@@ -511,7 +508,6 @@
bool m_hasSetCacheModel { false };
CacheModel m_cacheModel { CacheModel::DocumentViewer };
bool m_suppressMemoryPressureHandler { false };
- bool m_canHandleHTTPSServerTrustEvaluation { true };
String m_uiProcessBundleIdentifier;
DownloadManager m_downloadManager;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (252818 => 252819)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-11-23 01:13:18 UTC (rev 252819)
@@ -67,7 +67,6 @@
SyncAllCookies()
AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
- SetCanHandleHTTPSServerTrustEvaluation(bool value)
ClearCacheForAllOrigins(uint32_t cachesToClear)
SetCacheModel(enum:uint8_t WebKit::CacheModel cacheModel, String overrideCacheStorageDirectory)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (252818 => 252819)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-11-23 01:13:18 UTC (rev 252819)
@@ -40,7 +40,6 @@
void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
{
encoder.encodeEnum(cacheModel);
- encoder << canHandleHTTPSServerTrustEvaluation;
#if PLATFORM(MAC)
encoder << uiProcessCookieStorageIdentifier;
#endif
@@ -89,9 +88,6 @@
if (!decoder.decodeEnum(result.cacheModel))
return false;
- if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
- return false;
-
#if PLATFORM(MAC)
if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
return false;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (252818 => 252819)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-11-23 01:13:18 UTC (rev 252819)
@@ -52,7 +52,6 @@
static bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
CacheModel cacheModel { CacheModel::DocumentViewer };
- bool canHandleHTTPSServerTrustEvaluation { true };
#if PLATFORM(MAC)
Vector<uint8_t> uiProcessCookieStorageIdentifier;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (252818 => 252819)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-11-23 01:13:18 UTC (rev 252819)
@@ -642,7 +642,7 @@
return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
// Handle server trust evaluation at platform-level if requested, for performance reasons and to use ATS defaults.
- if (!_session->networkProcess().canHandleHTTPSServerTrustEvaluation() || sessionCocoa->fastServerTrustEvaluationEnabled()) {
+ if (sessionCocoa->fastServerTrustEvaluationEnabled()) {
#if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
auto* networkDataTask = [self existingTask:task];
ASSERT(networkDataTask);
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp (252818 => 252819)
--- trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-11-23 01:13:18 UTC (rev 252819)
@@ -381,7 +381,6 @@
void WKContextSetCanHandleHTTPSServerTrustEvaluation(WKContextRef contextRef, bool value)
{
- WebKit::toImpl(contextRef)->setCanHandleHTTPSServerTrustEvaluation(value);
}
void WKContextSetPrewarmsProcessesAutomatically(WKContextRef contextRef, bool value)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (252818 => 252819)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2019-11-23 01:13:18 UTC (rev 252819)
@@ -198,7 +198,6 @@
- (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value
{
- _processPool->setCanHandleHTTPSServerTrustEvaluation(value);
}
static WebKit::HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(NSHTTPCookieAcceptPolicy policy)
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (252818 => 252819)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-11-23 01:13:18 UTC (rev 252819)
@@ -493,7 +493,6 @@
}
parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
- parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
@@ -1492,15 +1491,6 @@
sendToAllProcesses(Messages::WebProcess::SetDomainRelaxationForbiddenForURLScheme(urlScheme));
}
-void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
-{
- m_canHandleHTTPSServerTrustEvaluation = value;
- if (m_networkProcess) {
- m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
- return;
- }
-}
-
void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
{
LegacyGlobalSettings::singleton().registerURLSchemeAsLocal(urlScheme);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (252818 => 252819)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-11-23 01:08:29 UTC (rev 252818)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-11-23 01:13:18 UTC (rev 252819)
@@ -269,7 +269,6 @@
void setAlwaysUsesComplexTextCodePath(bool);
void setShouldUseFontSmoothing(bool);
- void setCanHandleHTTPSServerTrustEvaluation(bool);
void registerURLSchemeAsEmptyDocument(const String&);
void registerURLSchemeAsSecure(const String&);
void registerURLSchemeAsBypassingContentSecurityPolicy(const String&);
@@ -792,7 +791,6 @@
bool m_isDelayedWebProcessLaunchDisabled { false };
#endif
bool m_useSeparateServiceWorkerProcess { false };
- bool m_canHandleHTTPSServerTrustEvaluation { true };
};
template<typename T>
