Title: [182565] trunk/Source
- Revision
- 182565
- Author
- [email protected]
- Date
- 2015-04-08 14:00:19 -0700 (Wed, 08 Apr 2015)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182564 => 182565)
--- 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)
@@ -1,3 +1,16 @@
+2015-04-08 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Block popups from content extensions.
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (182564 => 182565)
--- 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)
@@ -190,21 +190,6 @@
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()
{
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.h (182564 => 182565)
--- 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)
@@ -48,9 +48,6 @@
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 @@
static bool requestIsHTTPOrHTTPSGet(const ResourceRequest&);
- WEBCORE_EXPORT static int64_t diskUsageForOrigin(SecurityOrigin*);
-
int64_t estimatedSizeInStorage() const { return m_estimatedSizeInStorage; }
private:
Modified: trunk/Source/WebKit2/ChangeLog (182564 => 182565)
--- 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)
@@ -1,3 +1,17 @@
+2015-04-08 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
32-bit build fix after r182554.
Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp (182564 => 182565)
--- 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)
@@ -78,13 +78,12 @@
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)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (182564 => 182565)
--- 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)
@@ -356,8 +356,7 @@
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 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
