ChangeLog

112012-07-09 Carlos Garcia Campos <cgarcia@igalia.com>

        [GTK] Implement disk cache in WebKit2

        https://bugs.webkit.org/show_bug.cgi?id=90797

        Reviewed by NOBODY (OOPS!).

        * WebProcess/gtk/WebProcessGtk.cpp:

        (WebKit::getCacheDiskFreeSize): Use an ASSERT instead of an early

        return since the cache feature is now always added to the session.

        (WebKit::WebProcess::platformSetCacheModel): Get the cache from

        the session and set the maximum cache size as computed by

        calculateCacheSizes().

        (WebKit::WebProcess::platformClearResourceCaches): Call

        soup_cache_clear().

        (WebKit::WebProcess::platformTerminate): Make sure all pending

        data is saved to the disk before the web process finishes.

        * WebProcess/gtk/WebProcessMainGtk.cpp:

        (WebKit::WebProcessMainGtk): Create a SoupCache feature and add it

        to the default SoupSession.

2012-07-09  Carlos Garcia Campos  <cgarcia@igalia.com>

        [GTK] Fix inspector detach when inspector was attached by the client

        https://bugs.webkit.org/show_bug.cgi?id=90763

Source/WebKit2/WebProcess/gtk/WebProcessGtk.cpp

@@namespace WebKit {

static uint64_t getCacheDiskFreeSize(SoupCache* cache)

{

50 if (!cache)

51 return 0;

50 ASSERT(cache);

    GOwnPtr<char> cacheDir;

    g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);

@@void WebProcess::platformSetCacheModel(CacheModel cacheModel)

    unsigned long urlCacheDiskCapacity = 0;

    SoupSession* session = WebCore::ResourceHandle::defaultSession();

92 SoupCache* cache = ~~reinterpret_cast<SoupCache*>~~(soup_session_get_feature(session, SOUP_TYPE_CACHE));

93 uint64_t diskFreeSize = getCacheDiskFreeSize(cache);

91 SoupCache* cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));

92 uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;

    uint64_t memSize = getMemorySize();

    calculateCacheSizes(cacheModel, memSize, diskFreeSize,

@@void WebProcess::platformSetCacheModel(CacheModel cacheModel)

    WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);

    WebCore::pageCache()->setCapacity(pageCacheCapacity);

    if (cache) {

        if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))

            soup_cache_set_max_size(cache, urlCacheDiskCapacity);

    }

103 if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))

104 soup_cache_set_max_size(cache, urlCacheDiskCapacity);

108105}

109106

110 void WebProcess::platformClearResourceCaches(ResourceCachesToClear)

107void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear)

111108{

112 notImplemented();

    if (cachesToClear == InMemoryResourceCachesOnly)

        return;

    SoupSession* session = WebCore::ResourceHandle::defaultSession();

    soup_cache_clear(SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE)));

}

void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters&, CoreIPC::ArgumentDecoder*)

@@void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters

void WebProcess::platformTerminate()

{

    SoupSession* session = WebCore::ResourceHandle::defaultSession();

    SoupCache* cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));

    soup_cache_flush(cache);

    soup_cache_dump(cache);

}

} // namespace WebKit

Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp

#include "config.h"

#include "WebProcessMainGtk.h"

30#define LIBSOUP_USE_UNSTABLE_REQUEST_API

#include "WebAuthDialog.h"

#include "WKBase.h"

#include <WebCore/GtkAuthenticationDialog.h>

#include <WebCore/RunLoop.h>

#include <WebKit2/WebProcess.h>

#include <gtk/gtk.h>

39#include <libsoup/soup-cache.h>

#include <runtime/InitializeThreading.h>

#include <unistd.h>

#include <wtf/MainThread.h>

43#include <wtf/gobject/GOwnPtr.h>

44#include <wtf/gobject/GRefPtr.h>

using namespace WebCore;

@@WK_EXPORT int WebProcessMainGtk(int argc, char* argv[])

    g_object_set(session, SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,

                 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();

    return 0;