[webkit-changes] [201267] trunk/Source/WebKit2

Mon, 23 May 2016 00:22:26 -0700

Title: [201267] trunk/Source/WebKit2
Revision
201267
Author
[email protected]
Date
2016-05-23 00:21:28 -0700 (Mon, 23 May 2016)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (201266 => 201267)


--- trunk/Source/WebKit2/ChangeLog	2016-05-23 04:02:22 UTC (rev 201266)
+++ trunk/Source/WebKit2/ChangeLog	2016-05-23 07:21:28 UTC (rev 201267)
@@ -1,3 +1,20 @@
+2016-05-22  Carlos Garcia Campos  <[email protected]>
+
+        [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  <[email protected]>
 
         Move to C++14.

Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (201266 => 201267)


--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp	2016-05-23 04:02:22 UTC (rev 201266)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp	2016-05-23 07:21:28 UTC (rev 201267)
@@ -73,7 +73,13 @@
     // Clear the old soup cache if it exists.
     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
     // conflicts with other cache files in the same directory. Remove the old cache files if they still exist.

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (201266 => 201267)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp	2016-05-23 04:02:22 UTC (rev 201266)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp	2016-05-23 07:21:28 UTC (rev 201267)
@@ -262,6 +262,7 @@
     API::ProcessPoolConfiguration configuration;
     configuration.setInjectedBundlePath(WebCore::filenameToString(bundleFilename.get()));
     configuration.setMaximumProcessCount(1);
+    configuration.setDiskCacheSpeculativeValidationEnabled(true);
 
     WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
     WebKitWebContextPrivate* priv = webContext->priv;

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (201266 => 201267)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2016-05-23 04:02:22 UTC (rev 201266)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2016-05-23 07:21:28 UTC (rev 201267)
@@ -238,10 +238,7 @@
 #if ENABLE(NETWORK_CACHE)
     parameters.shouldEnableNetworkCache = isNetworkCacheEnabled();
     parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-    parameters.shouldEnableNetworkCacheSpeculativeRevalidation = m_configuration->diskCacheSpeculativeValidationEnabled();
 #endif
-#endif
 
     parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];

Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (201266 => 201267)


--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-05-23 04:02:22 UTC (rev 201266)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-05-23 07:21:28 UTC (rev 201267)
@@ -352,6 +352,9 @@
     parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
     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)
     String cookieStorageDirectory = this->cookieStorageDirectory();

Modified: trunk/Source/WebKit2/config.h (201266 => 201267)


--- trunk/Source/WebKit2/config.h	2016-05-23 04:02:22 UTC (rev 201266)
+++ trunk/Source/WebKit2/config.h	2016-05-23 07:21:28 UTC (rev 201267)
@@ -107,7 +107,7 @@
 #endif
 
 #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
 #define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 0

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to