<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205556] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205556">205556</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-09-07 11:13:08 -0700 (Wed, 07 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Switch to ENABLE_NETWORK_CACHE
https://bugs.webkit.org/show_bug.cgi?id=152676
Reviewed by Alex Christensen.
.:
Build with -Wno-error=missing-field-initializers to avoid spurious build failures.
* Source/cmake/OptionsEfl.cmake:
Source/WebCore:
* PlatformEfl.cmake: Add GRefPtrSoup to build.
* platform/network/soup/SoupNetworkSession.cpp:
(WebCore::SoupNetworkSession::clearOldSoupCache): Renamed from clearCache.
(WebCore::SoupNetworkSession::setCache): Deleted.
(WebCore::SoupNetworkSession::cache): Deleted.
(WebCore::SoupNetworkSession::clearCache): Deleted.
* platform/network/soup/SoupNetworkSession.h:
Source/WebKit2:
Nowadays GTK+ always uses the network cache, and never the soup cache. Remove support for
using the soup cache, and switch the EFL port to use network cache.
* NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
(WebKit::NetworkCache::BlobStorage::add): Check return value of link to placate
-Werror=unused-result on EFL builder
* NetworkProcess/efl/NetworkProcessMainEfl.cpp:
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::getCacheDiskFreeSize):
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
(WebKit::NetworkProcess::platformSetCacheModel):
(WebKit::NetworkProcess::clearDiskCache):
* PlatformEfl.cmake: Add files to build.
* UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp:
(API::WebsiteDataStore::defaultNetworkCacheDirectory): Use a saner location.
* UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp:
(API::WebsiteDataStore::defaultNetworkCacheDirectory):
* UIProcess/API/gtk/WebKitPrivate.h:
* UIProcess/soup/WebProcessPoolSoup.cpp:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
* WebProcess/efl/WebProcessMainEfl.cpp:
* config.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheBlobStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesseflNetworkProcessMainEflcpp">trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflAPIWebsiteDataStoreEflcpp">trunk/Source/WebKit2/UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkAPIWebsiteDataStoreGtkcpp">trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesssoupWebProcessPoolSoupcpp">trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesseflWebProcessMainEflcpp">trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2configh">trunk/Source/WebKit2/config.h</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/ChangeLog 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-07 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [EFL] Switch to ENABLE_NETWORK_CACHE
+ https://bugs.webkit.org/show_bug.cgi?id=152676
+
+ Reviewed by Alex Christensen.
+
+ Build with -Wno-error=missing-field-initializers to avoid spurious build failures.
+
+ * Source/cmake/OptionsEfl.cmake:
+
</ins><span class="cx"> 2016-09-07 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Separate compile flag for ReadableStream and WritableStream
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebCore/ChangeLog 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-07 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [EFL] Switch to ENABLE_NETWORK_CACHE
+ https://bugs.webkit.org/show_bug.cgi?id=152676
+
+ Reviewed by Alex Christensen.
+
+ * PlatformEfl.cmake: Add GRefPtrSoup to build.
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::SoupNetworkSession::clearOldSoupCache): Renamed from clearCache.
+ (WebCore::SoupNetworkSession::setCache): Deleted.
+ (WebCore::SoupNetworkSession::cache): Deleted.
+ (WebCore::SoupNetworkSession::clearCache): Deleted.
+ * platform/network/soup/SoupNetworkSession.h:
+
</ins><span class="cx"> 2016-09-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop legacy canvas.probablySupportsContext()
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> platform/network/soup/CookieStorageSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span><span class="cx"> platform/network/soup/DNSSoup.cpp
</span><ins>+ platform/network/soup/GRefPtrSoup.cpp
</ins><span class="cx"> platform/network/soup/NetworkStorageSessionSoup.cpp
</span><span class="cx"> platform/network/soup/ProxyServerSoup.cpp
</span><span class="cx"> platform/network/soup/ResourceErrorSoup.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -160,18 +160,6 @@
</span><span class="cx"> return SOUP_COOKIE_JAR(soup_session_get_feature(m_soupSession.get(), SOUP_TYPE_COOKIE_JAR));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SoupNetworkSession::setCache(SoupCache* cache)
-{
- ASSERT(!soup_session_get_feature(m_soupSession.get(), SOUP_TYPE_CACHE));
- soup_session_add_feature(m_soupSession.get(), SOUP_SESSION_FEATURE(cache));
-}
-
-SoupCache* SoupNetworkSession::cache() const
-{
- SoupSessionFeature* soupCache = soup_session_get_feature(m_soupSession.get(), SOUP_TYPE_CACHE);
- return soupCache ? SOUP_CACHE(soupCache) : nullptr;
-}
-
</del><span class="cx"> static inline bool stringIsNumeric(const char* str)
</span><span class="cx"> {
</span><span class="cx"> while (*str) {
</span><span class="lines">@@ -182,7 +170,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SoupNetworkSession::clearCache(const String& cacheDirectory)
</del><ins>+// Old versions of WebKit created this cache.
+void SoupNetworkSession::clearOldSoupCache(const String& cacheDirectory)
</ins><span class="cx"> {
</span><span class="cx"> CString cachePath = fileSystemRepresentation(cacheDirectory);
</span><span class="cx"> GUniquePtr<char> cacheFile(g_build_filename(cachePath.data(), "soup.cache2", nullptr));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> void setCookieJar(SoupCookieJar*);
</span><span class="cx"> SoupCookieJar* cookieJar() const;
</span><span class="cx">
</span><del>- void setCache(SoupCache*);
- SoupCache* cache() const;
- static void clearCache(const String& cacheDirectory);
</del><ins>+ static void clearOldSoupCache(const String& cacheDirectory);
</ins><span class="cx">
</span><span class="cx"> void setSSLPolicy(SSLPolicy);
</span><span class="cx"> SSLPolicy sslPolicy() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-09-07 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [EFL] Switch to ENABLE_NETWORK_CACHE
+ https://bugs.webkit.org/show_bug.cgi?id=152676
+
+ Reviewed by Alex Christensen.
+
+ Nowadays GTK+ always uses the network cache, and never the soup cache. Remove support for
+ using the soup cache, and switch the EFL port to use network cache.
+
+ * NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
+ (WebKit::NetworkCache::BlobStorage::add): Check return value of link to placate
+ -Werror=unused-result on EFL builder
+ * NetworkProcess/efl/NetworkProcessMainEfl.cpp:
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::getCacheDiskFreeSize):
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+ (WebKit::NetworkProcess::platformSetCacheModel):
+ (WebKit::NetworkProcess::clearDiskCache):
+ * PlatformEfl.cmake: Add files to build.
+ * UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp:
+ (API::WebsiteDataStore::defaultNetworkCacheDirectory): Use a saner location.
+ * UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp:
+ (API::WebsiteDataStore::defaultNetworkCacheDirectory):
+ * UIProcess/API/gtk/WebKitPrivate.h:
+ * UIProcess/soup/WebProcessPoolSoup.cpp:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * WebProcess/efl/WebProcessMainEfl.cpp:
+ * config.h:
+
</ins><span class="cx"> 2016-09-07 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Separate compile flag for ReadableStream and WritableStream
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheBlobStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -97,7 +97,8 @@
</span><span class="cx"> if (blobExists) {
</span><span class="cx"> auto existingData = mapFile(blobPath.data());
</span><span class="cx"> if (bytesEqual(existingData, data)) {
</span><del>- link(blobPath.data(), linkPath.data());
</del><ins>+ if (link(blobPath.data(), linkPath.data()) == -1)
+ WTFLogAlways("Failed to create hard link from %s to %s", blobPath.data(), linkPath.data());
</ins><span class="cx"> return { existingData, hash };
</span><span class="cx"> }
</span><span class="cx"> unlink(blobPath.data());
</span><span class="lines">@@ -107,7 +108,8 @@
</span><span class="cx"> if (mappedData.isNull())
</span><span class="cx"> return { };
</span><span class="cx">
</span><del>- link(blobPath.data(), linkPath.data());
</del><ins>+ if (link(blobPath.data(), linkPath.data()) == -1)
+ WTFLogAlways("Failed to create hard link from %s to %s", blobPath.data(), linkPath.data());
</ins><span class="cx">
</span><span class="cx"> m_approximateSize += mappedData.size();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesseflNetworkProcessMainEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -53,11 +53,6 @@
</span><span class="cx">
</span><span class="cx"> void platformFinalize() override
</span><span class="cx"> {
</span><del>- if (SoupCache* soupCache = SoupNetworkSession::defaultSession().cache()) {
- soup_cache_flush(soupCache);
- soup_cache_dump(soupCache);
- }
-
</del><span class="cx"> ecore_shutdown();
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -55,9 +55,7 @@
</span><span class="cx"> ASSERT(!parameters.diskCacheDirectory.isEmpty());
</span><span class="cx"> m_diskCacheDirectory = parameters.diskCacheDirectory;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_CACHE)
- // Clear the old soup cache if it exists.
- SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(m_diskCacheDirectory));
</del><ins>+ SoupNetworkSession::defaultSession().clearOldSoupCache(WebCore::directoryName(m_diskCacheDirectory));
</ins><span class="cx">
</span><span class="cx"> NetworkCache::Cache::Parameters cacheParameters {
</span><span class="cx"> parameters.shouldEnableNetworkCacheEfficacyLogging
</span><span class="lines">@@ -66,21 +64,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> NetworkCache::singleton().initialize(m_diskCacheDirectory, cacheParameters);
</span><del>-#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.
- SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(m_diskCacheDirectory));
</del><span class="cx">
</span><del>- GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(m_diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
- 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
- // resource. The final size of the cache will be set by NetworkProcess::platformSetCacheModel().
- unsigned initialMaxSize = soup_cache_get_max_size(soupCache.get());
- soup_cache_set_max_size(soupCache.get(), G_MAXUINT);
- soup_cache_load(soupCache.get());
- soup_cache_set_max_size(soupCache.get(), initialMaxSize);
-#endif
-
</del><span class="cx"> if (!parameters.cookiePersistentStoragePath.isEmpty()) {
</span><span class="cx"> supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
</span><span class="cx"> parameters.cookiePersistentStorageType);
</span><span class="lines">@@ -93,15 +77,8 @@
</span><span class="cx"> setIgnoreTLSErrors(parameters.ignoreTLSErrors);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::platformSetURLCacheSize(unsigned /*urlCacheMemoryCapacity*/, uint64_t urlCacheDiskCapacity)
</del><ins>+void NetworkProcess::platformSetURLCacheSize(unsigned, uint64_t)
</ins><span class="cx"> {
</span><del>-#if !ENABLE(NETWORK_CACHE)
- SoupCache* cache = SoupNetworkSession::defaultSession().cache();
- if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
- soup_cache_set_max_size(cache, urlCacheDiskCapacity);
-#else
- UNUSED_PARAM(urlCacheDiskCapacity);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="lines">@@ -124,13 +101,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_CACHE)
</del><span class="cx"> NetworkCache::singleton().clear(modifiedSince, WTFMove(completionHandler));
</span><del>-#else
- UNUSED_PARAM(modifiedSince);
- UNUSED_PARAM(completionHandler);
- soup_cache_clear(SoupNetworkSession::defaultSession().cache());
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformTerminate()
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -8,6 +8,10 @@
</span><span class="cx">
</span><span class="cx"> NetworkProcess/Downloads/soup/DownloadSoup.cpp
</span><span class="cx">
</span><ins>+ NetworkProcess/cache/NetworkCacheCodersSoup.cpp
+ NetworkProcess/cache/NetworkCacheDataSoup.cpp
+ NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp
+
</ins><span class="cx"> NetworkProcess/efl/NetworkProcessMainEfl.cpp
</span><span class="cx">
</span><span class="cx"> NetworkProcess/soup/NetworkProcessSoup.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflAPIWebsiteDataStoreEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/UIProcess/API/efl/APIWebsiteDataStoreEfl.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -38,13 +38,7 @@
</span><span class="cx">
</span><span class="cx"> String WebsiteDataStore::defaultNetworkCacheDirectory()
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_CACHE)
- static const char networkCacheSubdirectory[] = "WebKitCache";
-#else
- static const char networkCacheSubdirectory[] = "webkit";
-#endif
-
- return cacheDirectoryFileSystemRepresentation(networkCacheSubdirectory);
</del><ins>+ return cacheDirectoryFileSystemRepresentation("WebKitEfl" EINA_PATH_SEP_S "WebKitCache");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkAPIWebsiteDataStoreGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/APIWebsiteDataStoreGtk.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -35,14 +35,11 @@
</span><span class="cx"> return cacheDirectoryFileSystemRepresentation("webkitgtk" G_DIR_SEPARATOR_S "applications");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: The other directories in this file are shared between all applications using WebKitGTK+.
+// Why is only this directory namespaced to a particular application?
</ins><span class="cx"> String WebsiteDataStore::defaultNetworkCacheDirectory()
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_CACHE)
- static const char networkCacheSubdirectory[] = "WebKitCache";
-#else
- static const char networkCacheSubdirectory[] = "webkit";
-#endif
- return cacheDirectoryFileSystemRepresentation(WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_prgname()), networkCacheSubdirectory));
</del><ins>+ return cacheDirectoryFileSystemRepresentation(WebCore::pathByAppendingComponent(WebCore::filenameToString(g_get_prgname()), "WebKitCache"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebsiteDataStore::defaultIndexedDBDatabaseDirectory()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -127,10 +127,6 @@
</span><span class="cx"> SnapshotRegionFullDocument
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_CACHE)
</del><span class="cx"> static const char networkCacheSubdirectory[] = "WebKitCache";
</span><del>-#else
-static const char networkCacheSubdirectory[] = "webkit";
-#endif
</del><span class="cx">
</span><span class="cx"> #endif // WebKitPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesssoupWebProcessPoolSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -41,9 +41,7 @@
</span><span class="cx"> parameters.ignoreTLSErrors = m_ignoreTLSErrors;
</span><span class="cx"> parameters.languages = WebCore::userPreferredLanguages();
</span><span class="cx"> parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
</span><del>-#if ENABLE(NETWORK_CACHE)
</del><span class="cx"> parameters.shouldEnableNetworkCacheEfficacyLogging = false;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesseflWebProcessMainEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -104,11 +104,6 @@
</span><span class="cx">
</span><span class="cx"> void platformFinalize() override
</span><span class="cx"> {
</span><del>- if (SoupCache* soupCache = SoupNetworkSession::defaultSession().cache()) {
- soup_cache_flush(soupCache);
- soup_cache_dump(soupCache);
- }
-
</del><span class="cx"> edje_shutdown();
</span><span class="cx"> ecore_evas_shutdown();
</span><span class="cx"> #ifdef HAVE_ECORE_X
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/WebKit2/config.h 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef ENABLE_NETWORK_CACHE
</span><del>-#if PLATFORM(COCOA) || PLATFORM(GTK)
</del><ins>+#if PLATFORM(COCOA) || USE(SOUP)
</ins><span class="cx"> #define ENABLE_NETWORK_CACHE 1
</span><span class="cx"> #else
</span><span class="cx"> #define ENABLE_NETWORK_CACHE 0
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (205555 => 205556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2016-09-07 17:24:14 UTC (rev 205555)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-09-07 18:13:08 UTC (rev 205556)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: Disable WERROR in clang build because of many warnings.
</span><span class="cx"> if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
</span><del>- set(ADDITIONAL_COMPILER_FLAGS ENABLE_WERROR)
</del><ins>+ set(ADDITIONAL_COMPILER_FLAGS ENABLE_WERROR "-Wno-error=missing-field-initializers")
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> set(USE_SOUP 1)
</span></span></pre>
</div>
</div>
</body>
</html>