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/MediaCache | |
| 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/MediaCache')
| -rw-r--r-- | Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp b/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp index 6baf6d9..4a5d7f9 100644 --- a/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp +++ b/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp @@ -53,6 +53,8 @@ void WebMediaCacheManager::didReceiveMessage(CoreIPC::Connection* connection, Co void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID) { + WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); + Vector<String> mediaCacheHostnames; #if ENABLE(VIDEO) @@ -60,23 +62,24 @@ void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID) #endif WebProcess::shared().connection()->send(Messages::WebMediaCacheManagerProxy::DidGetHostnamesWithMediaCache(mediaCacheHostnames, callbackID), 0); - WebProcess::shared().terminateIfPossible(); } void WebMediaCacheManager::clearCacheForHostname(const String& hostname) { + WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); + #if ENABLE(VIDEO) HTMLMediaElement::clearMediaCacheForSite(hostname); #endif - WebProcess::shared().terminateIfPossible(); } void WebMediaCacheManager::clearCacheForAllHostnames() { + WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); + #if ENABLE(VIDEO) HTMLMediaElement::clearMediaCache(); #endif - WebProcess::shared().terminateIfPossible(); } } // namespace WebKit |