diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp index 71ae14f..4f91e3d 100644 --- a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp +++ b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp @@ -30,6 +30,7 @@ #include "SecurityOriginData.h" #include "WebApplicationCacheManagerProxyMessages.h" #include "WebProcess.h" +#include <WebCore/ApplicationCache.h> #include <WebCore/ApplicationCacheStorage.h> #include <WebCore/SecurityOrigin.h> #include <WebCore/SecurityOriginHash.h> @@ -78,6 +79,7 @@ void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID) } WebProcess::shared().connection()->send(Messages::WebApplicationCacheManagerProxy::DidGetApplicationCacheOrigins(identifiers, callbackID), 0); + WebProcess::shared().terminateIfPossible(); } void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData& originData) @@ -87,8 +89,9 @@ void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData if (!origin) return; - cacheStorage().deleteEntriesForOrigin(origin.get()); + ApplicationCache::deleteCacheForOrigin(origin.get()); #endif + WebProcess::shared().terminateIfPossible(); } void WebApplicationCacheManager::deleteAllEntries() @@ -96,6 +99,7 @@ void WebApplicationCacheManager::deleteAllEntries() #if ENABLE(OFFLINE_WEB_APPLICATIONS) cacheStorage().deleteAllEntries(); #endif + WebProcess::shared().terminateIfPossible(); } } // namespace WebKit |