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
+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.
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()
{
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);
static bool requestIsHTTPOrHTTPSGet(const ResourceRequest&);
- WEBCORE_EXPORT static int64_t diskUsageForOrigin(SecurityOrigin*);
-
int64_t estimatedSizeInStorage() const { return m_estimatedSizeInStorage; }
private:
+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.
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)
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)
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)