Diff
Modified: trunk/Source/WebKit/ChangeLog (252817 => 252818)
--- trunk/Source/WebKit/ChangeLog 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/ChangeLog 2019-11-23 01:08:29 UTC (rev 252818)
@@ -1,3 +1,16 @@
+2019-11-22 Alex Christensen <[email protected]>
+
+ Unreviewed, rolling out r252798.
+
+ Turns out my reverting earlier today wasn't so necessary after all.
+ This is effectively re-landing r250421.
+
+ Reverted changeset:
+
+ "Revert r250421"
+ https://bugs.webkit.org/show_bug.cgi?id=202290
+ https://trac.webkit.org/changeset/252798
+
2019-11-22 Kate Cheney <[email protected]>
ITP Database crashes if table schema is not correct
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (252817 => 252818)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-11-23 01:08:29 UTC (rev 252818)
@@ -41,9 +41,6 @@
{
encoder.encodeEnum(cacheModel);
encoder << canHandleHTTPSServerTrustEvaluation;
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
- encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
-#endif
#if PLATFORM(MAC)
encoder << uiProcessCookieStorageIdentifier;
#endif
@@ -95,11 +92,6 @@
if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
return false;
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
- if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))
- return false;
-#endif
-
#if PLATFORM(MAC)
if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
return false;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (252817 => 252818)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-11-23 01:08:29 UTC (rev 252818)
@@ -57,9 +57,6 @@
#if PLATFORM(MAC)
Vector<uint8_t> uiProcessCookieStorageIdentifier;
#endif
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
- bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
-#endif
#if PLATFORM(IOS_FAMILY)
SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
SandboxExtension::Handle containerCachesDirectoryExtensionHandle;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (252817 => 252818)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-11-23 01:08:29 UTC (rev 252818)
@@ -115,11 +115,6 @@
m_cacheOptions = { NetworkCache::CacheOption::RegisterNotify };
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
- if (parameters.shouldEnableNetworkCacheSpeculativeRevalidation)
- m_cacheOptions.add(NetworkCache::CacheOption::SpeculativeRevalidation);
-#endif
-
// Disable NSURLCache.
auto urlCache(adoptNS([[NSURLCache alloc] initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil]));
[NSURLCache setSharedURLCache:urlCache.get()];
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (252817 => 252818)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-11-23 01:08:29 UTC (rev 252818)
@@ -44,7 +44,6 @@
{
auto copy = this->create();
- copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
copy->m_injectedBundlePath = this->m_injectedBundlePath;
copy->m_customClassesForParameterCoder = this->m_customClassesForParameterCoder;
copy->m_cachePartitionedURLSchemes = this->m_cachePartitionedURLSchemes;
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (252817 => 252818)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-11-23 01:08:29 UTC (rev 252818)
@@ -68,9 +68,6 @@
bool clientWouldBenefitFromAutomaticProcessPrewarming() const { return m_clientWouldBenefitFromAutomaticProcessPrewarming; }
void setClientWouldBenefitFromAutomaticProcessPrewarming(bool value) { m_clientWouldBenefitFromAutomaticProcessPrewarming = value; }
- bool diskCacheSpeculativeValidationEnabled() const { return m_diskCacheSpeculativeValidationEnabled; }
- void setDiskCacheSpeculativeValidationEnabled(bool enabled) { m_diskCacheSpeculativeValidationEnabled = enabled; }
-
void setUsesBackForwardCache(bool value) { m_usesBackForwardCache = value; }
bool usesBackForwardCache() const { return m_usesBackForwardCache; }
@@ -151,7 +148,6 @@
#endif
private:
- bool m_diskCacheSpeculativeValidationEnabled { false };
WTF::String m_injectedBundlePath;
Vector<WTF::String> m_customClassesForParameterCoder;
Vector<WTF::String> m_cachePartitionedURLSchemes;
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp (252817 => 252818)
--- trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-11-23 01:08:29 UTC (rev 252818)
@@ -419,9 +419,8 @@
WebKit::toImpl(contextRef)->resetServiceWorkerTimeoutForTesting();
}
-void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef contextRef, bool value)
+void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef, bool)
{
- WebKit::toImpl(contextRef)->configuration().setDiskCacheSpeculativeValidationEnabled(value);
}
void WKContextPreconnectToServer(WKContextRef, WKURLRef)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (252817 => 252818)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2019-11-23 01:08:29 UTC (rev 252818)
@@ -109,12 +109,11 @@
- (BOOL)diskCacheSpeculativeValidationEnabled
{
- return _processPoolConfiguration->diskCacheSpeculativeValidationEnabled();
+ return NO;
}
- (void)setDiskCacheSpeculativeValidationEnabled:(BOOL)enabled
{
- _processPoolConfiguration->setDiskCacheSpeculativeValidationEnabled(enabled);
}
- (BOOL)ignoreSynchronousMessagingTimeoutsForTesting
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (252817 => 252818)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-11-23 00:42:28 UTC (rev 252817)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-11-23 01:08:29 UTC (rev 252818)
@@ -498,10 +498,6 @@
for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
- parameters.shouldEnableNetworkCacheSpeculativeRevalidation = m_configuration->diskCacheSpeculativeValidationEnabled();
-#endif
-
#if PLATFORM(IOS_FAMILY)
String cookieStorageDirectory = WebProcessPool::cookieStorageDirectory();
if (!cookieStorageDirectory.isEmpty())
