<!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>[182551] trunk/Source</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/182551">182551</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 10:52:15 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move some ApplicationCache static member functions to ApplicationCacheStorage
https://bugs.webkit.org/show_bug.cgi?id=143524
Reviewed by Antti Koivisto.
Source/WebCore:
This is yet another step towards eliminating ApplicationCacheStorage::singleton() and making the storage be per page instead.
* loader/appcache/ApplicationCache.cpp:
(WebCore::ApplicationCache::deleteCacheForOrigin):
(WebCore::ApplicationCache::deleteAllCaches):
(WebCore::ApplicationCache::diskUsageForOrigin):
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::deleteAllCaches):
(WebCore::ApplicationCacheStorage::deleteCacheForOrigin):
(WebCore::ApplicationCacheStorage::diskUsageForOrigin):
* loader/appcache/ApplicationCacheStorage.h:
Source/WebKit/mac:
* WebCoreSupport/WebApplicationCache.mm:
(+[WebApplicationCache diskUsageForOrigin:]):
(+[WebApplicationCache deleteAllApplicationCaches]):
(+[WebApplicationCache deleteCacheForOrigin:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCachecpp">trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStorageh">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebApplicationCachemm">trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182550 => 182551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-08 17:51:17 UTC (rev 182550)
+++ trunk/Source/WebCore/ChangeLog 2015-04-08 17:52:15 UTC (rev 182551)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-08 Anders Carlsson <andersca@apple.com>
+
+ Move some ApplicationCache static member functions to ApplicationCacheStorage
+ https://bugs.webkit.org/show_bug.cgi?id=143524
+
+ Reviewed by Antti Koivisto.
+
+ This is yet another step towards eliminating ApplicationCacheStorage::singleton() and making the storage be per page instead.
+
+ * loader/appcache/ApplicationCache.cpp:
+ (WebCore::ApplicationCache::deleteCacheForOrigin):
+ (WebCore::ApplicationCache::deleteAllCaches):
+ (WebCore::ApplicationCache::diskUsageForOrigin):
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::deleteAllCaches):
+ (WebCore::ApplicationCacheStorage::deleteCacheForOrigin):
+ (WebCore::ApplicationCacheStorage::diskUsageForOrigin):
+ * loader/appcache/ApplicationCacheStorage.h:
+
</ins><span class="cx"> 2015-04-08 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Fill list style background with same color with that of list background.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (182550 => 182551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-04-08 17:51:17 UTC (rev 182550)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-04-08 17:52:15 UTC (rev 182551)
</span><span class="lines">@@ -192,45 +192,17 @@
</span><span class="cx">
</span><span class="cx"> void ApplicationCache::deleteCacheForOrigin(SecurityOrigin* origin)
</span><span class="cx"> {
</span><del>- auto& cacheStorage = ApplicationCacheStorage::singleton();
-
- Vector<URL> urls;
- if (!cacheStorage.getManifestURLs(&urls)) {
- LOG_ERROR("Failed to retrieve ApplicationCache manifest URLs");
- return;
- }
-
- URL originURL(URL(), origin->toString());
-
- size_t count = urls.size();
- for (size_t i = 0; i < count; ++i) {
- if (protocolHostAndPortAreEqual(urls[i], originURL)) {
- ApplicationCacheGroup* group = cacheStorage.findInMemoryCacheGroup(urls[i]);
- if (group)
- group->makeObsolete();
- else
- cacheStorage.deleteCacheGroup(urls[i]);
- }
- }
</del><ins>+ ApplicationCacheStorage::singleton().deleteCacheForOrigin(*origin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCache::deleteAllCaches()
</span><span class="cx"> {
</span><del>- HashSet<RefPtr<SecurityOrigin>> origins;
-
- auto& cacheStorage = ApplicationCacheStorage::singleton();
- cacheStorage.getOriginsWithCache(origins);
- for (auto& origin : origins)
- deleteCacheForOrigin(origin.get());
-
- cacheStorage.vacuumDatabaseFile();
</del><ins>+ ApplicationCacheStorage::singleton().deleteAllCaches();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int64_t ApplicationCache::diskUsageForOrigin(SecurityOrigin* origin)
</span><span class="cx"> {
</span><del>- int64_t usage = 0;
- ApplicationCacheStorage::singleton().calculateUsageForOrigin(origin, usage);
- return usage;
</del><ins>+ return ApplicationCacheStorage::singleton().diskUsageForOrigin(*origin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (182550 => 182551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2015-04-08 17:51:17 UTC (rev 182550)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2015-04-08 17:52:15 UTC (rev 182551)
</span><span class="lines">@@ -1542,6 +1542,45 @@
</span><span class="cx"> vacuumDatabaseFile();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ApplicationCacheStorage::deleteAllCaches()
+{
+ HashSet<RefPtr<SecurityOrigin>> origins;
+
+ getOriginsWithCache(origins);
+ for (auto& origin : origins)
+ deleteCacheForOrigin(*origin);
+
+ vacuumDatabaseFile();
+}
+
+void ApplicationCacheStorage::deleteCacheForOrigin(const SecurityOrigin& securityOrigin)
+{
+ Vector<URL> urls;
+ if (!getManifestURLs(&urls)) {
+ LOG_ERROR("Failed to retrieve ApplicationCache manifest URLs");
+ return;
+ }
+
+ URL originURL(URL(), securityOrigin.toString());
+
+ for (const auto& url : urls) {
+ if (!protocolHostAndPortAreEqual(url, originURL))
+ continue;
+
+ if (auto* group = findInMemoryCacheGroup(url))
+ group->makeObsolete();
+ else
+ deleteCacheGroup(url);
+ }
+}
+
+int64_t ApplicationCacheStorage::diskUsageForOrigin(const SecurityOrigin& securityOrigin)
+{
+ int64_t usage = 0;
+ calculateUsageForOrigin(&securityOrigin, usage);
+ return usage;
+}
+
</ins><span class="cx"> ApplicationCacheStorage::ApplicationCacheStorage()
</span><span class="cx"> : m_maximumSize(ApplicationCacheStorage::noQuota())
</span><span class="cx"> , m_isMaximumSizeReached(false)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h (182550 => 182551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2015-04-08 17:51:17 UTC (rev 182550)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2015-04-08 17:52:15 UTC (rev 182551)
</span><span class="lines">@@ -99,6 +99,15 @@
</span><span class="cx"> WEBCORE_EXPORT void getOriginsWithCache(HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash>&);
</span><span class="cx"> WEBCORE_EXPORT void deleteAllEntries();
</span><span class="cx">
</span><ins>+ // FIXME: This should be consolidated with deleteAllEntries().
+ WEBCORE_EXPORT void deleteAllCaches();
+
+ // FIXME: This should be consolidated with deleteCacheGroup().
+ WEBCORE_EXPORT void deleteCacheForOrigin(const SecurityOrigin&);
+
+ // FIXME: This should be consolidated with calculateUsageForOrigin().
+ WEBCORE_EXPORT int64_t diskUsageForOrigin(const SecurityOrigin&);
+
</ins><span class="cx"> static int64_t unknownQuota() { return -1; }
</span><span class="cx"> static int64_t noQuota() { return std::numeric_limits<int64_t>::max(); }
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182550 => 182551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-08 17:51:17 UTC (rev 182550)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-08 17:52:15 UTC (rev 182551)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-08 Anders Carlsson <andersca@apple.com>
+
+ Move some ApplicationCache static member functions to ApplicationCacheStorage
+ https://bugs.webkit.org/show_bug.cgi?id=143524
+
+ Reviewed by Antti Koivisto.
+
+ * WebCoreSupport/WebApplicationCache.mm:
+ (+[WebApplicationCache diskUsageForOrigin:]):
+ (+[WebApplicationCache deleteAllApplicationCaches]):
+ (+[WebApplicationCache deleteCacheForOrigin:]):
+
</ins><span class="cx"> 2015-04-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename ActiveDOMObject::canSuspend() to canSuspendForPageCache() for clarity
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebApplicationCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm (182550 => 182551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2015-04-08 17:51:17 UTC (rev 182550)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2015-04-08 17:52:15 UTC (rev 182551)
</span><span class="lines">@@ -82,17 +82,17 @@
</span><span class="cx">
</span><span class="cx"> + (long long)diskUsageForOrigin:(WebSecurityOrigin *)origin
</span><span class="cx"> {
</span><del>- return ApplicationCache::diskUsageForOrigin([origin _core]);
</del><ins>+ return webApplicationCacheStorage().diskUsageForOrigin(*[origin _core]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)deleteAllApplicationCaches
</span><span class="cx"> {
</span><del>- ApplicationCache::deleteAllCaches();
</del><ins>+ webApplicationCacheStorage().deleteAllCaches();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)deleteCacheForOrigin:(WebSecurityOrigin *)origin
</span><span class="cx"> {
</span><del>- ApplicationCache::deleteCacheForOrigin([origin _core]);
</del><ins>+ webApplicationCacheStorage().deleteCacheForOrigin(*[origin _core]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSArray *)originsWithCache
</span></span></pre>
</div>
</div>
</body>
</html>