Changeset 148886 in webkit

Timestamp:

Apr 22, 2013 8:57:22 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] Soup disk cache should respect the diskCacheDirectory from the process initial parameters
​https://bugs.webkit.org/show_bug.cgi?id=111845

Reviewed by Anders Carlsson.

Move the cache initialization to platformInitializeWebProcess() to
create the cache using the directory received from the UI
process. This allows to add public API to set a different disk
cache directory from the UI process.

• UIProcess/efl/WebContextEfl.cpp:

(WebKit::WebContext::platformDefaultDiskCacheDirectory): Return
default disk cache directory.

• UIProcess/gtk/WebContextGtk.cpp:

(WebKit::WebContext::platformDefaultDiskCacheDirectory): Ditto.

• WebProcess/efl/WebProcessMainEfl.cpp:

(WebKit::WebProcessMainEfl): Remove soup cache initialization.

• WebProcess/gtk/WebProcessMainGtk.cpp:

(WebKit::WebProcessMainGtk): Ditto.

• WebProcess/soup/WebProcessSoup.cpp:

(WebKit::WebProcess::platformInitializeWebProcess): Initialize
soup cache.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/efl/WebContextEfl.cpp (modified) (1 diff)
• UIProcess/gtk/WebContextGtk.cpp (modified) (1 diff)
• WebProcess/efl/WebProcessMainEfl.cpp (modified) (2 diffs)
• WebProcess/gtk/WebProcessMainGtk.cpp (modified) (1 diff)
• WebProcess/soup/WebProcessSoup.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Soup disk cache should respect the diskCacheDirectory from the process initial parameters
+        https://bugs.webkit.org/show_bug.cgi?id=111845
+
+        Reviewed by Anders Carlsson.
+
+        Move the cache initialization to platformInitializeWebProcess() to
+        create the cache using the directory received from the UI
+        process. This allows to add public API to set a different disk
+        cache directory from the UI process.
+
+        * UIProcess/efl/WebContextEfl.cpp:
+        (WebKit::WebContext::platformDefaultDiskCacheDirectory): Return
+        default disk cache directory.
+        * UIProcess/gtk/WebContextGtk.cpp:
+        (WebKit::WebContext::platformDefaultDiskCacheDirectory): Ditto.
+        * WebProcess/efl/WebProcessMainEfl.cpp:
+        (WebKit::WebProcessMainEfl): Remove soup cache initialization.
+        * WebProcess/gtk/WebProcessMainGtk.cpp:
+        (WebKit::WebProcessMainGtk): Ditto.
+        * WebProcess/soup/WebProcessSoup.cpp:
+        (WebKit::WebProcess::platformInitializeWebProcess): Initialize
+        soup cache.
+
 2013-04-22  Krzysztof Wolanski  <k.wolanski@samsung.com>:
 

trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp

@@ -118 +118 @@
 String WebContext::platformDefaultDiskCacheDirectory() const
 {
-    notImplemented();
-    return String();
+    return String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
 }
 

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

@@ -120 +120 @@
 String WebContext::platformDefaultDiskCacheDirectory() const
 {
-    notImplemented();
-    return String();
+    GOwnPtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), NULL));
+    return WebCore::filenameToString(diskCacheDirectory.get());
 }
 

trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp

@@ -124 +124 @@
     }
 
-    // Set SOUP cache.
-    String soupCacheDirectory = String::fromUTF8(efreet_cache_home_get()) + "/WebKitEfl";
-    SoupCache* soupCache = soup_cache_new(soupCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER);
-    soup_session_add_feature(session, SOUP_SESSION_FEATURE(soupCache));
-    soup_cache_load(soupCache);
-
     int socket = atoi(argv[1]);
 
@@ -139 +133 @@
     RunLoop::run();
 
-    soup_cache_flush(soupCache);
-    soup_cache_dump(soupCache);
-    g_object_unref(soupCache);
+    if (SoupSessionFeature* soupCache = soup_session_get_feature(session, SOUP_TYPE_CACHE)) {
+        soup_cache_flush(SOUP_CACHE(soupCache));
+        soup_cache_dump(SOUP_CACHE(soupCache));
+    }
 
     edje_shutdown();

trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp

@@ -76 +76 @@
                  SOUP_SESSION_SSL_STRICT, FALSE, NULL);
 
-    GOwnPtr<char> soupCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), NULL));
-    GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(soupCacheDirectory.get(), SOUP_CACHE_SINGLE_USER));
-    soup_session_add_feature(session, SOUP_SESSION_FEATURE(soupCache.get()));
-    soup_cache_load(soupCache.get());
-
     RunLoop::run();
 
-    soup_cache_flush(soupCache.get());
-    soup_cache_dump(soupCache.get());
+    if (SoupSessionFeature* soupCache = soup_session_get_feature(session, SOUP_TYPE_CACHE)) {
+        soup_cache_flush(SOUP_CACHE(soupCache));
+        soup_cache_dump(SOUP_CACHE(soupCache));
+    }
 
     return 0;

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

@@ -176 +176 @@
 #endif
 
+    ASSERT(!parameters.diskCacheDirectory.isEmpty());
+    GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(parameters.diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
+    soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
+    soup_cache_load(soupCache.get());
+
     if (!parameters.languages.isEmpty())
         setSoupSessionAcceptLanguage(parameters.languages);