Changeset 185317 in webkit

Timestamp:

Jun 8, 2015 8:59:14 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r185251): [GTK] webkit_web_context_set_disk_cache_directory() doesn't work when using shared secondary process model after r185251
​https://bugs.webkit.org/show_bug.cgi?id=145751

Reviewed by Darin Adler.

In r185251 the CFNetwork cache was disabled in the web process,
but it also removed the disk cache directory web process
initialization parameter. While we support networking in the web
process when shared secondary process model is used, the network
cache should still work. We can remove this if we eventually
switch to use the network process unconditionally.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode): Encode disk cache directory.
(WebKit::WebProcessCreationParameters::decode): Decode disk cache directory.

• Shared/WebProcessCreationParameters.h: Bring back disk cache directory only for soup.
• UIProcess/gtk/WebProcessPoolGtk.cpp:

(WebKit::WebProcessPool::platformInitializeWebProcess): Initialize disk cache directory parameter.

• WebProcess/soup/WebProcessSoup.cpp:

(WebKit::WebProcess::platformInitializeWebProcess): Use the disck cache directory parameter again.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/gtk/WebProcessPoolGtk.cpp (modified) (2 diffs)
• WebProcess/soup/WebProcessSoup.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r185251): [GTK] webkit_web_context_set_disk_cache_directory() doesn't work when using shared secondary process model after r185251
+        https://bugs.webkit.org/show_bug.cgi?id=145751
+
+        Reviewed by Darin Adler.
+
+        In r185251 the CFNetwork cache was disabled in the web process,
+        but it also removed the disk cache directory web process
+        initialization parameter. While we support networking in the web
+        process when shared secondary process model is used, the network
+        cache should still work. We can remove this if we eventually
+        switch to use the network process unconditionally.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode): Encode disk cache directory.
+        (WebKit::WebProcessCreationParameters::decode): Decode disk cache directory.
+        * Shared/WebProcessCreationParameters.h: Bring back disk cache directory only for soup.
+        * UIProcess/gtk/WebProcessPoolGtk.cpp:
+        (WebKit::WebProcessPool::platformInitializeWebProcess): Initialize disk cache directory parameter.
+        * WebProcess/soup/WebProcessSoup.cpp:
+        (WebKit::WebProcess::platformInitializeWebProcess): Use the disck cache directory parameter again.
+
 2015-06-08  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -97 +97 @@
     encoder << urlSchemesRegisteredForCustomProtocols;
 #if USE(SOUP)
+    encoder << diskCacheDirectory;
     encoder << cookiePersistentStoragePath;
     encoder << cookiePersistentStorageType;
@@ -218 +219 @@
         return false;
 #if USE(SOUP)
+    if (!decoder.decode(parameters.diskCacheDirectory))
+        return false;
     if (!decoder.decode(parameters.cookiePersistentStoragePath))
         return false;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -102 +102 @@
     Vector<String> urlSchemesRegisteredForCustomProtocols;
 #if USE(SOUP)
+    String diskCacheDirectory;
     String cookiePersistentStoragePath;
     uint32_t cookiePersistentStorageType;

trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp

@@ -29 +29 @@
 #include "WebProcessPool.h"
 
+#include "APIProcessPoolConfiguration.h"
 #include "Logging.h"
 #include "WebCookieManagerProxy.h"
@@ -106 +107 @@
 
         parameters.ignoreTLSErrors = m_ignoreTLSErrors;
+        parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
     }
 }

trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

@@ -32 +32 @@
 #endif
 
-#include "APIProcessPoolConfiguration.h"
 #include "CertificateInfo.h"
 #include "WebCookieManager.h"
@@ -137 +136 @@
         return;
 
-    auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
-
-    ASSERT(!configuration->diskCacheDirectory().isEmpty());
+    ASSERT(!parameters.diskCacheDirectory.isEmpty());
 
     // 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.
-    WebCore::SoupNetworkSession::defaultSession().clearCache(configuration->diskCacheDirectory());
+    WebCore::SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(parameters.diskCacheDirectory));
 
-    String diskCachePath = WebCore::pathByAppendingComponent(configuration->diskCacheDirectory(), "webkit");
-    GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.utf8().data(), SOUP_CACHE_SINGLE_USER));
+#if ENABLE(NETWORK_CACHE)
+    // When network cache is enabled, the disk cache directory is the network process one.
+    CString diskCachePath = WebCore::pathByAppendingComponent(WebCore::directoryName(parameters.diskCacheDirectory), "webkit").utf8();
+#else
+    CString diskCachePath = parameters.diskCacheDirectory.utf8();
+#endif
+
+    GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.data(), SOUP_CACHE_SINGLE_USER));
     WebCore::SoupNetworkSession::defaultSession().setCache(soupCache.get());
     // Set an initial huge max_size for the SoupCache so the call to soup_cache_load() won't evict any cached