diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp b/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp index b09d6414d..d8aa22bbd 100644 --- a/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp +++ b/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2011, 2013 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,8 +26,7 @@ #include "config.h" #include "WebMediaCacheManager.h" -#include "MessageID.h" -#include "SecurityOriginData.h" +#include "WebMediaCacheManagerMessages.h" #include "WebMediaCacheManagerProxyMessages.h" #include "WebProcess.h" #include <WebCore/HTMLMediaElement.h> @@ -36,38 +35,30 @@ using namespace WebCore; namespace WebKit { -WebMediaCacheManager& WebMediaCacheManager::shared() +const char* WebMediaCacheManager::supplementName() { - static WebMediaCacheManager& shared = *new WebMediaCacheManager; - return shared; + return "WebMediaCacheManager"; } -WebMediaCacheManager::WebMediaCacheManager() +WebMediaCacheManager::WebMediaCacheManager(WebProcess* process) + : m_process(process) { -} - -void WebMediaCacheManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder) -{ - didReceiveWebMediaCacheManagerMessage(connection, messageID, decoder); + m_process->addMessageReceiver(Messages::WebMediaCacheManager::messageReceiverName(), this); } void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID) { - WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); - Vector<String> mediaCacheHostnames; #if ENABLE(VIDEO) HTMLMediaElement::getSitesInMediaCache(mediaCacheHostnames); #endif - WebProcess::shared().connection()->send(Messages::WebMediaCacheManagerProxy::DidGetHostnamesWithMediaCache(mediaCacheHostnames, callbackID), 0); + m_process->send(Messages::WebMediaCacheManagerProxy::DidGetHostnamesWithMediaCache(mediaCacheHostnames, callbackID), 0); } void WebMediaCacheManager::clearCacheForHostname(const String& hostname) { - WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); - #if ENABLE(VIDEO) HTMLMediaElement::clearMediaCacheForSite(hostname); #endif @@ -75,8 +66,6 @@ void WebMediaCacheManager::clearCacheForHostname(const String& hostname) void WebMediaCacheManager::clearCacheForAllHostnames() { - WebProcess::LocalTerminationDisabler terminationDisabler(WebProcess::shared()); - #if ENABLE(VIDEO) HTMLMediaElement::clearMediaCache(); #endif |