Changeset 177038 in webkit

Timestamp:

Dec 9, 2014, 1:53:45 PM (11 years ago)

Author:

andersca@apple.com

Message:

Add support for clearing the disk cache
​https://bugs.webkit.org/show_bug.cgi?id=139458

Reviewed by Antti Koivisto.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::deleteWebsiteData):
If we're asked to clear the disk cache, do so. Clearing the cache is asynchronous,
so we make sure not to call the completion handler right away in that case.

• NetworkProcess/NetworkProcess.h:

Add clearDiskCache member function.

• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::clearDiskCache):
Clear the disk cache, then call the completion handler.

• NetworkProcess/mac/NetworkProcessMac.mm:

(WebKit::NetworkProcess::clearCacheForAllOrigins):
Call the new clearDiskCache function.

• Shared/WebsiteData/WebsiteDataTypes.h:

Add WebsiteDataTypeDiskCache.

• UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
• UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:

(toWebsiteDataTypes):
Handle WKWebsiteDataTypeDiskCache.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (1 diff)
• NetworkProcess/mac/NetworkProcessMac.mm (modified) (1 diff)
• Shared/WebsiteData/WebsiteDataTypes.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStore.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-09  Anders Carlsson  <andersca@apple.com>
+
+        Add support for clearing the disk cache
+        https://bugs.webkit.org/show_bug.cgi?id=139458
+
+        Reviewed by Antti Koivisto.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::deleteWebsiteData):
+        If we're asked to clear the disk cache, do so. Clearing the cache is asynchronous,
+        so we make sure not to call the completion handler right away in that case.
+
+        * NetworkProcess/NetworkProcess.h:
+        Add clearDiskCache member function.
+
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::clearDiskCache):
+        Clear the disk cache, then call the completion handler.
+
+        * NetworkProcess/mac/NetworkProcessMac.mm:
+        (WebKit::NetworkProcess::clearCacheForAllOrigins):
+        Call the new clearDiskCache function.
+
+        * Shared/WebsiteData/WebsiteDataTypes.h:
+        Add WebsiteDataTypeDiskCache.
+
+        * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+        * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+        (toWebsiteDataTypes):
+        Handle WKWebsiteDataTypeDiskCache.
+
 2014-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -244 +244 @@
     }
 
-    parentProcessConnection()->send(Messages::NetworkProcessProxy::DidDeleteWebsiteData(callbackID), 0);
+    auto completionHandler = [this, callbackID] {
+        parentProcessConnection()->send(Messages::NetworkProcessProxy::DidDeleteWebsiteData(callbackID), 0);
+    };
+
+    if ((websiteDataTypes & WebsiteDataTypeDiskCache) & !sessionID.isEphemeral()) {
+        clearDiskCache(modifiedSince, WTF::move(completionHandler));
+        return;
+    }
+
+    completionHandler();
 }
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

@@ -116 +116 @@
     void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
 
+    // FIXME: This should take a session ID so we can identify which disk cache to delete.
+    void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+
     void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest&);
     void resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);

trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -134 +134 @@
 }
 
+void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
+{
+    if (!m_clearCacheDispatchGroup)
+        m_clearCacheDispatchGroup = dispatch_group_create();
+
+    dispatch_group_async(m_clearCacheDispatchGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [modifiedSince, completionHandler] {
+        NSURLCache *cache = [NSURLCache sharedURLCache];
+
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+        NSTimeInterval timeInterval = std::chrono::duration_cast<std::chrono::duration<double>>(modifiedSince.time_since_epoch()).count();
+        NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
+        [cache removeCachedResponsesSinceDate:date];
+#else
+        [cache removeAllCachedResponses];
+#endif
+        dispatch_async(dispatch_get_main_queue(), [completionHandler] {
+            completionHandler();
+        });
+    });
+}
+
 }
 

trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm

@@ -130 +130 @@
         return;
 
-    if (!m_clearCacheDispatchGroup)
-        m_clearCacheDispatchGroup = dispatch_group_create();
-
-    dispatch_group_async(m_clearCacheDispatchGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [[NSURLCache sharedURLCache] removeAllCachedResponses];
-    });
+    clearDiskCache(std::chrono::system_clock::time_point::min(), [] { });
 }
 

trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h

@@ -31 +31 @@
 enum WebsiteDataTypes {
     WebsiteDataTypeCookies = 1 << 0,
+    WebsiteDataTypeDiskCache = 1 << 1,
 };
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h

@@ -32 +32 @@
 typedef NS_OPTIONS(NSUInteger, WKWebsiteDataTypes) {
     WKWebsiteDataTypeCookies = 1 << 0,
+    WKWebsiteDataTypeDiskCache = 1 << 1,
 
     WKWebsiteDataTypeAll = NSUIntegerMax,

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm

@@ -61 +61 @@
     if (wkWebsiteDataTypes & WKWebsiteDataTypeCookies)
         websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeCookies;
+    if (wkWebsiteDataTypes & WKWebsiteDataTypeDiskCache)
+        websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeDiskCache;
 
     return static_cast<WebsiteDataTypes>(websiteDataTypes);