Title: [199839] trunk/Source/WebKit2
- Revision
- 199839
- Author
- ander...@apple.com
- Date
- 2016-04-21 15:24:36 -0700 (Thu, 21 Apr 2016)
Log Message
Remove two uses of ApplicationCacheStorage::singleton() from WebKit2
https://bugs.webkit.org/show_bug.cgi?id=156873
Reviewed by Beth Dakin.
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::clearApplicationCache): Deleted.
* WebProcess/WebProcess.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199838 => 199839)
--- trunk/Source/WebKit2/ChangeLog 2016-04-21 22:24:17 UTC (rev 199838)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-21 22:24:36 UTC (rev 199839)
@@ -1,3 +1,16 @@
+2016-04-21 Anders Carlsson <ander...@apple.com>
+
+ Remove two uses of ApplicationCacheStorage::singleton() from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=156873
+
+ Reviewed by Beth Dakin.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::reachedApplicationCacheOriginQuota):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::clearApplicationCache): Deleted.
+ * WebProcess/WebProcess.h:
+
2016-04-21 Beth Dakin <bda...@apple.com>
showCandidates() should take a range and the string should be the whole
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (199838 => 199839)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-04-21 22:24:17 UTC (rev 199838)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-04-21 22:24:36 UTC (rev 199839)
@@ -668,7 +668,7 @@
if (m_page->injectedBundleUIClient().didReachApplicationCacheOriginQuota(m_page, securityOrigin.get(), totalBytesNeeded))
return;
- auto& cacheStorage = ApplicationCacheStorage::singleton();
+ auto& cacheStorage = m_page->corePage()->applicationCacheStorage();
int64_t currentQuota = 0;
if (!cacheStorage.calculateQuotaForOrigin(origin, currentQuota))
return;
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (199838 => 199839)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-04-21 22:24:17 UTC (rev 199838)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-04-21 22:24:36 UTC (rev 199839)
@@ -742,12 +742,6 @@
CrossOriginPreflightResultCache::singleton().empty();
}
-void WebProcess::clearApplicationCache()
-{
- // Empty the application cache.
- ApplicationCacheStorage::singleton().empty();
-}
-
static inline void addCaseFoldedCharacters(StringHasher& hasher, const String& string)
{
if (string.isEmpty())
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (199838 => 199839)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-04-21 22:24:17 UTC (rev 199838)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-04-21 22:24:36 UTC (rev 199839)
@@ -256,7 +256,6 @@
void platformSetCacheModel(CacheModel);
void platformClearResourceCaches(ResourceCachesToClear);
- void clearApplicationCache();
void setEnhancedAccessibility(bool);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
