Changeset 252798 in webkit

Timestamp:

Nov 22, 2019 1:32:18 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Revert r250421
​https://bugs.webkit.org/show_bug.cgi?id=202290

This is needed for rdar://problem/56760896
I left the soup parts of the original change untouched, which leaves speculative validation on for soup ports.

• NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

• NetworkProcess/NetworkProcessCreationParameters.h:
• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

• UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::copy):

• UIProcess/API/APIProcessPoolConfiguration.h:
• UIProcess/API/C/WKContext.cpp:

(WKContextSetDiskCacheSpeculativeValidationEnabled):

• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:

(-[_WKProcessPoolConfiguration diskCacheSpeculativeValidationEnabled]):
(-[_WKProcessPoolConfiguration setDiskCacheSpeculativeValidationEnabled:]):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureNetworkProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcessCreationParameters.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.cpp (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.h (modified) (2 diffs)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-22  Alex Christensen  <achristensen@webkit.org>
+
+        Revert r250421
+        https://bugs.webkit.org/show_bug.cgi?id=202290
+
+        This is needed for rdar://problem/56760896
+        I left the soup parts of the original change untouched, which leaves speculative validation on for soup ports.
+
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode const):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::copy):
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextSetDiskCacheSpeculativeValidationEnabled):
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+        (-[_WKProcessPoolConfiguration diskCacheSpeculativeValidationEnabled]):
+        (-[_WKProcessPoolConfiguration setDiskCacheSpeculativeValidationEnabled:]):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+
 2019-11-22  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

@@ -42 +42 @@
     encoder.encodeEnum(cacheModel);
     encoder << canHandleHTTPSServerTrustEvaluation;
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+    encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
+#endif
 #if PLATFORM(MAC)
     encoder << uiProcessCookieStorageIdentifier;
@@ -93 +96 @@
         return false;
 
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+    if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))
+        return false;
+#endif
+
 #if PLATFORM(MAC)
     if (!decoder.decode(result.uiProcessCookieStorageIdentifier))

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

@@ -58 +58 @@
     Vector<uint8_t> uiProcessCookieStorageIdentifier;
 #endif
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+    bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
+#endif
 #if PLATFORM(IOS_FAMILY)
     SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -116 +116 @@
     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]));

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

@@ -45 +45 @@
     auto copy = this->create();
 
+    copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
     copy->m_injectedBundlePath = this->m_injectedBundlePath;
     copy->m_customClassesForParameterCoder = this->m_customClassesForParameterCoder;

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

@@ -68 +68 @@
     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; }
@@ -149 +152 @@
 
 private:
+    bool m_diskCacheSpeculativeValidationEnabled { false };
     WTF::String m_injectedBundlePath;
     Vector<WTF::String> m_customClassesForParameterCoder;

trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

@@ -420 +420 @@
 }
 
-void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef, bool)
-{
+void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef contextRef, bool value)
+{
+    WebKit::toImpl(contextRef)->configuration().setDiskCacheSpeculativeValidationEnabled(value);
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm

@@ -110 +110 @@
 - (BOOL)diskCacheSpeculativeValidationEnabled
 {
-    return NO;
+    return _processPoolConfiguration->diskCacheSpeculativeValidationEnabled();
 }
 
 - (void)setDiskCacheSpeculativeValidationEnabled:(BOOL)enabled
 {
+    _processPoolConfiguration->setDiskCacheSpeculativeValidationEnabled(enabled);
 }
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -499 +499 @@
         parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
 
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+    parameters.shouldEnableNetworkCacheSpeculativeRevalidation = m_configuration->diskCacheSpeculativeValidationEnabled();
+#endif
+
 #if PLATFORM(IOS_FAMILY)
     String cookieStorageDirectory = WebProcessPool::cookieStorageDirectory();