Attachment 214269 Details for Bug 118343 – patch on top of attachment213980

[patch] patch on top of attachment213980

1.patch (text/plain), 5.61 KB, created by Csaba Osztrogonác on 2013-10-15 09:26:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2013-10-15 09:26:53 PDT

Size: 5.61 KB

patch

obsolete

>diff --git a/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp b/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
>index bdd22d3..d7caaa2 100644
>--- a/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
>+++ b/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
>@@ -29,7 +29,6 @@
> #include "NetworkProcess.h"
> 
> #include "CacheModelHelper.h"
>-#include "Logging.h"
> #include "NetworkProcessCreationParameters.h"
> #include "ResourceCachesToClear.h"
> #include <WebCore/NotImplemented.h>
>@@ -61,7 +60,7 @@ void NetworkProcess::platformSetCacheModel(CacheModel cacheModel)
>     unsigned long urlCacheMemoryCapacity = 0;
>     unsigned long urlCacheDiskCapacity = 0;
> 
>-    SoupSession* session = WebCore::ResourceHandle::defaultSession();
>+    SoupSession* session = ResourceHandle::defaultSession();
>     SoupCache* cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));
>     uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
> 
>@@ -84,7 +83,7 @@ void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
>     if (cachesToClear == InMemoryResourceCachesOnly)
>         return;
> 
>-    SoupSession* session = WebCore::ResourceHandle::defaultSession();
>+    SoupSession* session = ResourceHandle::defaultSession();
>     soup_cache_clear(SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE)));
> }
> 
>diff --git a/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp b/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp
>index 54a3fcb..4d2739c 100644
>--- a/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp
>+++ b/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp
>@@ -68,7 +68,7 @@ WK_EXPORT int NetworkProcessMain(int argc, char* argv[])
>     InitializeWebKit2();
> 
> #if USE(SOUP)
>-    SoupSession* session = WebCore::ResourceHandle::defaultSession();
>+    SoupSession* session = ResourceHandle::defaultSession();
> #if PLATFORM(EFL)
>     // Only for EFL because GTK port uses the default resolver, which uses GIO's proxy resolver.
>     const char* httpProxy = getenv("http_proxy");
>diff --git a/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp b/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
>index 59cfc33..375baa5 100644
>--- a/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
>+++ b/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
>@@ -58,11 +58,20 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
>     unsigned long urlCacheMemoryCapacity = 0;
>     unsigned long urlCacheDiskCapacity = 0;
> 
>-    SoupSession* session = WebCore::ResourceHandle::defaultSession();
>-    SoupCache* cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));
>-    uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
>+    uint64_t diskFreeSize =  0;
>+    SoupCache* cache = nullptr;
> 
>+#if ENABLE(NETWORK_PROCESS)
>+    if (!m_usesNetworkProcess) {
>+#endif
>+        SoupSession* session = WebCore::ResourceHandle::defaultSession();
>+        cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));
>+        diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
>+#if ENABLE(NETWORK_PROCESS)
>+    }
>+#endif
>     uint64_t memSize = getMemorySize();
>+
>     calculateCacheSizes(cacheModel, memSize, diskFreeSize,
>                         cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval,
>                         pageCacheCapacity, urlCacheMemoryCapacity, urlCacheDiskCapacity);
>@@ -71,8 +80,14 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
>     WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
>     WebCore::pageCache()->setCapacity(pageCacheCapacity);
> 
>-    if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
>-        soup_cache_set_max_size(cache, urlCacheDiskCapacity);
>+#if ENABLE(NETWORK_PROCESS)
>+    if (!m_usesNetworkProcess) {
>+#endif
>+        if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
>+            soup_cache_set_max_size(cache, urlCacheDiskCapacity);
>+#if ENABLE(NETWORK_PROCESS)
>+    }
>+#endif
> }
> 
> void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear)
>@@ -80,6 +95,12 @@ void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear
>     if (cachesToClear == InMemoryResourceCachesOnly)
>         return;
> 
>+    // If we're using the network process then it is the only one that needs to clear the disk cache.
>+#if ENABLE(NETWORK_PROCESS)
>+    if (m_usesNetworkProcess)
>+        return;
>+#endif
>+
>     SoupSession* session = WebCore::ResourceHandle::defaultSession();
>     soup_cache_clear(SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE)));
> }
>@@ -145,10 +166,16 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
>     }
> #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 ENABLE(NETWORK_PROCESS)
>+    if (!m_usesNetworkProcess) {
>+#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 ENABLE(NETWORK_PROCESS)
>+    }
>+#endif
> 
>     if (!parameters.languages.isEmpty())
>         setSoupSessionAcceptLanguage(parameters.languages);

Actions: View | Formatted Diff | Diff

Attachments on bug 118343: 205980 | 212715 | 213006 | 213980 | 214269 | 214274 | 218743