<!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>[182565] 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/182565">182565</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 14:00:19 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Delete ApplicationCache static member functions
https://bugs.webkit.org/show_bug.cgi?id=143534
Reviewed by Tim Horton.
Source/WebCore:
* loader/appcache/ApplicationCache.cpp:
(WebCore::ApplicationCache::deleteCacheForOrigin): Deleted.
(WebCore::ApplicationCache::deleteAllCaches): Deleted.
(WebCore::ApplicationCache::diskUsageForOrigin): Deleted.
* loader/appcache/ApplicationCache.h:
Source/WebKit2:
* WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
(WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
(WebKit::WebApplicationCacheManager::deleteAllEntries):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::clearApplicationCacheForOrigin):
(WebKit::InjectedBundle::appCacheUsageForOrigin):</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="#trunkSourceWebCoreloaderappcacheApplicationCacheh">trunk/Source/WebCore/loader/appcache/ApplicationCache.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp">trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182564 => 182565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-08 20:26:41 UTC (rev 182564)
+++ trunk/Source/WebCore/ChangeLog 2015-04-08 21:00:19 UTC (rev 182565)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-08 Anders Carlsson <andersca@apple.com>
+
+ Delete ApplicationCache static member functions
+ https://bugs.webkit.org/show_bug.cgi?id=143534
+
+ Reviewed by Tim Horton.
+
+ * loader/appcache/ApplicationCache.cpp:
+ (WebCore::ApplicationCache::deleteCacheForOrigin): Deleted.
+ (WebCore::ApplicationCache::deleteAllCaches): Deleted.
+ (WebCore::ApplicationCache::diskUsageForOrigin): Deleted.
+ * loader/appcache/ApplicationCache.h:
+
</ins><span class="cx"> 2015-04-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Block popups from content extensions.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (182564 => 182565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-04-08 20:26:41 UTC (rev 182564)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-04-08 21:00:19 UTC (rev 182565)
</span><span class="lines">@@ -190,21 +190,6 @@
</span><span class="cx"> resource->clearStorageID();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCache::deleteCacheForOrigin(SecurityOrigin* origin)
-{
- ApplicationCacheStorage::singleton().deleteCacheForOrigin(*origin);
-}
-
-void ApplicationCache::deleteAllCaches()
-{
- ApplicationCacheStorage::singleton().deleteAllCaches();
-}
-
-int64_t ApplicationCache::diskUsageForOrigin(SecurityOrigin* origin)
-{
- return ApplicationCacheStorage::singleton().diskUsageForOrigin(*origin);
-}
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void ApplicationCache::dump()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.h (182564 => 182565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2015-04-08 20:26:41 UTC (rev 182564)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2015-04-08 21:00:19 UTC (rev 182565)
</span><span class="lines">@@ -48,9 +48,6 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<ApplicationCache> create() { return adoptRef(*new ApplicationCache); }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static void deleteCacheForOrigin(SecurityOrigin*);
- WEBCORE_EXPORT static void deleteAllCaches();
-
</del><span class="cx"> ~ApplicationCache();
</span><span class="cx">
</span><span class="cx"> void addResource(PassRefPtr<ApplicationCacheResource> resource);
</span><span class="lines">@@ -90,8 +87,6 @@
</span><span class="cx">
</span><span class="cx"> static bool requestIsHTTPOrHTTPSGet(const ResourceRequest&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static int64_t diskUsageForOrigin(SecurityOrigin*);
-
</del><span class="cx"> int64_t estimatedSizeInStorage() const { return m_estimatedSizeInStorage; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182564 => 182565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-08 20:26:41 UTC (rev 182564)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-08 21:00:19 UTC (rev 182565)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-08 Anders Carlsson <andersca@apple.com>
+
+ Delete ApplicationCache static member functions
+ https://bugs.webkit.org/show_bug.cgi?id=143534
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
+ (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin):
+ (WebKit::WebApplicationCacheManager::deleteAllEntries):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::clearApplicationCacheForOrigin):
+ (WebKit::InjectedBundle::appCacheUsageForOrigin):
+
</ins><span class="cx"> 2015-04-08 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> 32-bit build fix after r182554.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp (182564 => 182565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2015-04-08 20:26:41 UTC (rev 182564)
+++ trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2015-04-08 21:00:19 UTC (rev 182565)
</span><span class="lines">@@ -78,13 +78,12 @@
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
</span><span class="cx"> {
</span><del>- Ref<SecurityOrigin> origin(SecurityOrigin::create(originData.protocol, originData.host, originData.port));
- ApplicationCache::deleteCacheForOrigin(&origin.get());
</del><ins>+ ApplicationCacheStorage::singleton().deleteCacheForOrigin(originData.securityOrigin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManager::deleteAllEntries()
</span><span class="cx"> {
</span><del>- ApplicationCache::deleteAllCaches();
</del><ins>+ ApplicationCacheStorage::singleton().deleteAllEntries();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManager::setAppCacheMaximumSize(uint64_t size)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (182564 => 182565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-04-08 20:26:41 UTC (rev 182564)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-04-08 21:00:19 UTC (rev 182565)
</span><span class="lines">@@ -356,8 +356,7 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearApplicationCacheForOrigin(const String& originString)
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
- ApplicationCache::deleteCacheForOrigin(origin.get());
</del><ins>+ ApplicationCacheStorage::singleton().deleteCacheForOrigin(SecurityOrigin::createFromString(originString));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setAppCacheMaximumSize(uint64_t size)
</span><span class="lines">@@ -367,8 +366,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t InjectedBundle::appCacheUsageForOrigin(const String& originString)
</span><span class="cx"> {
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
- return ApplicationCache::diskUsageForOrigin(origin.get());
</del><ins>+ return ApplicationCacheStorage::singleton().diskUsageForOrigin(SecurityOrigin::createFromString(originString));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setApplicationCacheOriginQuota(const String& originString, uint64_t bytes)
</span></span></pre>
</div>
</div>
</body>
</html>