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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b6536084ee87cacf58ad31439eb0bd692c3ed33a..c00099e56b9b23e22035bf780a5ce0ce58760f15 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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:
+
 2015-04-08  Alex Christensen  <achristensen@webkit.org>
 
         Block popups from content extensions.

diff --git a/Source/WebCore/loader/appcache/ApplicationCache.cpp b/Source/WebCore/loader/appcache/ApplicationCache.cpp
index d8af68e1584e474894de835657ac8f44361a22a9..a13e690568a4bdc501a276b4e49d31b894346205 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCache.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCache.cpp
@@ -190,21 +190,6 @@ void ApplicationCache::clearStorageID()
         resource->clearStorageID();
 }
     
-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);
-}
-
 #ifndef NDEBUG
 void ApplicationCache::dump()
 {

diff --git a/Source/WebCore/loader/appcache/ApplicationCache.h b/Source/WebCore/loader/appcache/ApplicationCache.h
index 8f4b7001d1b6e17c3cc6f4f90342a48c9962e3f3..2c52b6898805bb4dd30781fc1f5d9cca020fb9b7 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCache.h
+++ b/Source/WebCore/loader/appcache/ApplicationCache.h
@@ -48,9 +48,6 @@ class ApplicationCache : public RefCounted<ApplicationCache> {
 public:
     static Ref<ApplicationCache> create() { return adoptRef(*new ApplicationCache); }
     
-    WEBCORE_EXPORT static void deleteCacheForOrigin(SecurityOrigin*);
-    WEBCORE_EXPORT static void deleteAllCaches();
-
     ~ApplicationCache();
 
     void addResource(PassRefPtr<ApplicationCacheResource> resource);
@@ -90,8 +87,6 @@ public:
     
     static bool requestIsHTTPOrHTTPSGet(const ResourceRequest&);
 
-    WEBCORE_EXPORT static int64_t diskUsageForOrigin(SecurityOrigin*);
-    
     int64_t estimatedSizeInStorage() const { return m_estimatedSizeInStorage; }
 
 private:

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index abafc43b0414dbc0e98dc07c00ab6c94b216a347..844fa886a36e8f09fcf9998039116276950dba70 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+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):
+
 2015-04-08  Enrica Casucci  <enrica@apple.com>
 
         32-bit build fix after r182554.

diff --git a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp
index 191d04daaaf1b61c934a23929f8d93a9c21eded5..9cc8e7155f4d1e29e9dc205452255c5270aa5afe 100644 (file)
--- a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp
+++ b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp
@@ -78,13 +78,12 @@ void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID)
 
 void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
 {
-    Ref<SecurityOrigin> origin(SecurityOrigin::create(originData.protocol, originData.host, originData.port));
-    ApplicationCache::deleteCacheForOrigin(&origin.get());
+    ApplicationCacheStorage::singleton().deleteCacheForOrigin(originData.securityOrigin());
 }
 
 void WebApplicationCacheManager::deleteAllEntries()
 {
-    ApplicationCache::deleteAllCaches();
+    ApplicationCacheStorage::singleton().deleteAllEntries();
 }
 
 void WebApplicationCacheManager::setAppCacheMaximumSize(uint64_t size)

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
index 20e79210348b02a1a38a0eda6082df3e3a809e90..cc11318c4041a427e8b59e227171cbf9bd79a958 100644 (file)
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
@@ -356,8 +356,7 @@ void InjectedBundle::clearApplicationCache()
 
 void InjectedBundle::clearApplicationCacheForOrigin(const String& originString)
 {
-    RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
-    ApplicationCache::deleteCacheForOrigin(origin.get());
+    ApplicationCacheStorage::singleton().deleteCacheForOrigin(SecurityOrigin::createFromString(originString));
 }
 
 void InjectedBundle::setAppCacheMaximumSize(uint64_t size)
@@ -367,8 +366,7 @@ void InjectedBundle::setAppCacheMaximumSize(uint64_t size)
 
 uint64_t InjectedBundle::appCacheUsageForOrigin(const String& originString)
 {
-    RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
-    return ApplicationCache::diskUsageForOrigin(origin.get());
+    return ApplicationCacheStorage::singleton().diskUsageForOrigin(SecurityOrigin::createFromString(originString));
 }
 
 void InjectedBundle::setApplicationCacheOriginQuota(const String& originString, uint64_t bytes)