Changeset 201267 in webkit

Timestamp:

May 23, 2016 12:21:28 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Disk cache: enable speculative revalidation
​https://bugs.webkit.org/show_bug.cgi?id=157125

Reviewed by Sergio Villar Senin.

• NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::NetworkProcess::platformInitializeNetworkProcess):

• UIProcess/API/gtk/WebKitWebContext.cpp:

(webkitWebContextConstructed):

• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureNetworkProcess):

• config.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/soup/NetworkProcessSoup.cpp (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebContext.cpp (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)
• config.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Disk cache: enable speculative revalidation
+        https://bugs.webkit.org/show_bug.cgi?id=157125
+
+        Reviewed by Sergio Villar Senin.
+
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkitWebContextConstructed):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        * config.h:
+
 2016-05-22  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp

@@ -74 +74 @@
     SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(m_diskCacheDirectory));
 
-    NetworkCache::singleton().initialize(m_diskCacheDirectory, { parameters.shouldEnableNetworkCacheEfficacyLogging });
+    NetworkCache::Cache::Parameters cacheParameters {
+        parameters.shouldEnableNetworkCacheEfficacyLogging
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+        , parameters.shouldEnableNetworkCacheSpeculativeRevalidation
+#endif
+    };
+    NetworkCache::singleton().initialize(m_diskCacheDirectory, cacheParameters);
 #else
     // We used to use the given cache directory for the soup cache, but now we use a subdirectory to avoid

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -263 +263 @@
     configuration.setInjectedBundlePath(WebCore::filenameToString(bundleFilename.get()));
     configuration.setMaximumProcessCount(1);
+    configuration.setDiskCacheSpeculativeValidationEnabled(true);
 
     WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);

trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -239 +239 @@
     parameters.shouldEnableNetworkCache = isNetworkCacheEnabled();
     parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-    parameters.shouldEnableNetworkCacheSpeculativeRevalidation = m_configuration->diskCacheSpeculativeValidationEnabled();
-#endif
 #endif
 

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -353 +353 @@
     if (!parameters.diskCacheDirectory.isEmpty())
         SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+    parameters.shouldEnableNetworkCacheSpeculativeRevalidation = m_configuration->diskCacheSpeculativeValidationEnabled();
+#endif
 
 #if PLATFORM(IOS)

trunk/Source/WebKit2/config.h

@@ -108 +108 @@
 
 #ifndef ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION
-#if ENABLE(NETWORK_CACHE) && PLATFORM(COCOA)
+#if ENABLE(NETWORK_CACHE) && (PLATFORM(COCOA) || PLATFORM(GTK))
 #define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 1
 #else