diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit2/WebProcess/ApplicationCache | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit2/WebProcess/ApplicationCache')
| -rw-r--r-- | Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp index 4f91e3d..5f9a724 100644 --- a/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp +++ b/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp @@ -56,6 +56,8 @@ void WebApplicationCacheManager::didReceiveMessage(CoreIPC::Connection* connecti void WebApplicationCacheManager::getApplicationCacheOrigins(uint64_t callbackID) { + WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); + HashSet<RefPtr<SecurityOrigin>, SecurityOriginHash> origins; #if ENABLE(OFFLINE_WEB_APPLICATIONS) @@ -79,11 +81,12 @@ 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) { + WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); + #if ENABLE(OFFLINE_WEB_APPLICATIONS) RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port); if (!origin) @@ -91,15 +94,15 @@ void WebApplicationCacheManager::deleteEntriesForOrigin(const SecurityOriginData ApplicationCache::deleteCacheForOrigin(origin.get()); #endif - WebProcess::shared().terminateIfPossible(); } void WebApplicationCacheManager::deleteAllEntries() { + WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); + #if ENABLE(OFFLINE_WEB_APPLICATIONS) cacheStorage().deleteAllEntries(); #endif - WebProcess::shared().terminateIfPossible(); } } // namespace WebKit |