Diff
Modified: trunk/Source/WebKit2/ChangeLog (196697 => 196698)
--- trunk/Source/WebKit2/ChangeLog 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,3 +1,51 @@
+2016-02-17 Anders Carlsson <[email protected]>
+
+ Remove unused media cache manager code
+ https://bugs.webkit.org/show_bug.cgi?id=154339
+
+ Reviewed by Tim Horton.
+
+ * DerivedSources.make:
+ * Shared/API/c/WKBase.h:
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetMediaCacheManager): Deleted.
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/C/WKMediaCacheManager.cpp: Removed.
+ (WKMediaCacheManagerGetTypeID): Deleted.
+ (WKMediaCacheManagerGetHostnamesWithMediaCache): Deleted.
+ (WKMediaCacheManagerClearCacheForHostname): Deleted.
+ (WKMediaCacheManagerClearCacheForAllHostnames): Deleted.
+ * UIProcess/API/C/WKMediaCacheManager.h: Removed.
+ * UIProcess/WebMediaCacheManagerProxy.cpp: Removed.
+ (WebKit::WebMediaCacheManagerProxy::supplementName): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::create): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::WebMediaCacheManagerProxy): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::~WebMediaCacheManagerProxy): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::processPoolDestroyed): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::processDidClose): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::shouldTerminate): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::refWebContextSupplement): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::derefWebContextSupplement): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::getHostnamesWithMediaCache): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::clearCacheForHostname): Deleted.
+ (WebKit::WebMediaCacheManagerProxy::clearCacheForAllHostnames): Deleted.
+ * UIProcess/WebMediaCacheManagerProxy.h: Removed.
+ * UIProcess/WebMediaCacheManagerProxy.messages.in: Removed.
+ * UIProcess/WebProcessPool.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/MediaCache/WebMediaCacheManager.cpp: Removed.
+ (WebKit::WebMediaCacheManager::supplementName): Deleted.
+ (WebKit::WebMediaCacheManager::WebMediaCacheManager): Deleted.
+ (WebKit::WebMediaCacheManager::getHostnamesWithMediaCache): Deleted.
+ (WebKit::WebMediaCacheManager::clearCacheForHostname): Deleted.
+ (WebKit::WebMediaCacheManager::clearCacheForAllHostnames): Deleted.
+ * WebProcess/MediaCache/WebMediaCacheManager.h: Removed.
+ * WebProcess/MediaCache/WebMediaCacheManager.messages.in: Removed.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::m_webSQLiteDatabaseTracker): Deleted.
+
2016-02-16 Dean Jackson <[email protected]>
Allow double tap to zoom in fast-click pages
Modified: trunk/Source/WebKit2/DerivedSources.make (196697 => 196698)
--- trunk/Source/WebKit2/DerivedSources.make 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/DerivedSources.make 2016-02-17 18:15:57 UTC (rev 196698)
@@ -121,8 +121,6 @@
WebInspector \
WebInspectorProxy \
WebInspectorUI \
- WebMediaCacheManager \
- WebMediaCacheManagerProxy \
WebNotificationManager \
WebPage \
WebPageGroupProxy \
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (196697 => 196698)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-02-17 18:15:57 UTC (rev 196698)
@@ -110,7 +110,6 @@
typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef;
typedef const struct OpaqueWKInspector* WKInspectorRef;
typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
-typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
typedef const struct OpaqueWKMediaSessionFocusManager* WKMediaSessionFocusManagerRef;
typedef const struct OpaqueWKMediaSessionMetadata* WKMediaSessionMetadataRef;
typedef const struct OpaqueWKNavigationAction* WKNavigationActionRef;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2016-02-17 18:15:57 UTC (rev 196698)
@@ -91,7 +91,6 @@
class WebGrammarDetail;
class WebIconDatabase;
class WebInspectorProxy;
-class WebMediaCacheManagerProxy;
class WebMediaSessionFocusManager;
class WebMediaSessionMetadata;
class WebNotification;
@@ -135,7 +134,6 @@
WK_ADD_API_MAPPING(WKHitTestResultRef, API::HitTestResult)
WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
WK_ADD_API_MAPPING(WKInspectorRef, WebInspectorProxy)
-WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
WK_ADD_API_MAPPING(WKMediaSessionFocusManagerRef, WebMediaSessionFocusManager)
WK_ADD_API_MAPPING(WKMediaSessionMetadataRef, WebMediaSessionMetadata)
WK_ADD_API_MAPPING(WKNavigationActionRef, API::NavigationAction)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-02-17 18:15:57 UTC (rev 196698)
@@ -47,7 +47,6 @@
// Supplements
#include "WebCookieManagerProxy.h"
#include "WebGeolocationManagerProxy.h"
-#include "WebMediaCacheManagerProxy.h"
#include "WebNotificationManagerProxy.h"
#if ENABLE(BATTERY_STATUS)
#include "WebBatteryManagerProxy.h"
@@ -433,11 +432,6 @@
return reinterpret_cast<WKKeyValueStorageManagerRef>(WKContextGetWebsiteDataStore(context));
}
-WKMediaCacheManagerRef WKContextGetMediaCacheManager(WKContextRef contextRef)
-{
- return toAPI(toImpl(contextRef)->supplement<WebMediaCacheManagerProxy>());
-}
-
WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context)
{
#if ENABLE(MEDIA_SESSION)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-02-17 18:15:57 UTC (rev 196698)
@@ -130,7 +130,6 @@
WK_EXPORT WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef context);
WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);
WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context);
-WK_EXPORT WKMediaCacheManagerRef WKContextGetMediaCacheManager(WKContextRef context);
WK_EXPORT WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context);
WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
WK_EXPORT WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context);
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WKMediaCacheManager.h"
-
-#include "WKAPICast.h"
-#include "WebMediaCacheManagerProxy.h"
-
-using namespace WebKit;
-
-WKTypeID WKMediaCacheManagerGetTypeID()
-{
- return toAPI(WebMediaCacheManagerProxy::APIType);
-}
-
-void WKMediaCacheManagerGetHostnamesWithMediaCache(WKMediaCacheManagerRef mediaCacheManagerRef, void* context, WKMediaCacheManagerGetHostnamesWithMediaCacheFunction callback)
-{
- toImpl(mediaCacheManagerRef)->getHostnamesWithMediaCache(toGenericCallbackFunction(context, callback));
-}
-
-void WKMediaCacheManagerClearCacheForHostname(WKMediaCacheManagerRef mediaCacheManagerRef, WKStringRef hostname)
-{
- toImpl(mediaCacheManagerRef)->clearCacheForHostname(toWTFString(hostname));
-}
-
-void WKMediaCacheManagerClearCacheForAllHostnames(WKMediaCacheManagerRef mediaCacheManagerRef)
-{
- toImpl(mediaCacheManagerRef)->clearCacheForAllHostnames();
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKMediaCacheManager_h
-#define WKMediaCacheManager_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKMediaCacheManagerGetTypeID();
-
-typedef void (*WKMediaCacheManagerGetHostnamesWithMediaCacheFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKMediaCacheManagerGetHostnamesWithMediaCache(WKMediaCacheManagerRef mediaCacheManager, void* context, WKMediaCacheManagerGetHostnamesWithMediaCacheFunction function);
-
-WK_EXPORT void WKMediaCacheManagerClearCacheForHostname(WKMediaCacheManagerRef mediaCacheManager, WKStringRef hostname);
-WK_EXPORT void WKMediaCacheManagerClearCacheForAllHostnames(WKMediaCacheManagerRef mediaCacheManager);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKMediaCacheManager_h
Deleted: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,114 +0,0 @@
-/*
- * 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebMediaCacheManagerProxy.h"
-
-#include "APIArray.h"
-#include "WebMediaCacheManagerMessages.h"
-#include "WebMediaCacheManagerProxyMessages.h"
-#include "WebProcessPool.h"
-
-namespace WebKit {
-
-const char* WebMediaCacheManagerProxy::supplementName()
-{
- return "WebMediaCacheManagerProxy";
-}
-
-PassRefPtr<WebMediaCacheManagerProxy> WebMediaCacheManagerProxy::create(WebProcessPool* processPool)
-{
- return adoptRef(new WebMediaCacheManagerProxy(processPool));
-}
-
-WebMediaCacheManagerProxy::WebMediaCacheManagerProxy(WebProcessPool* processPool)
- : WebContextSupplement(processPool)
-{
- WebContextSupplement::processPool()->addMessageReceiver(Messages::WebMediaCacheManagerProxy::messageReceiverName(), *this);
-}
-
-WebMediaCacheManagerProxy::~WebMediaCacheManagerProxy()
-{
-}
-
-// WebContextSupplement
-
-void WebMediaCacheManagerProxy::processPoolDestroyed()
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
-}
-
-void WebMediaCacheManagerProxy::processDidClose(WebProcessProxy*)
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
-}
-
-bool WebMediaCacheManagerProxy::shouldTerminate(WebProcessProxy*) const
-{
- return m_arrayCallbacks.isEmpty();
-}
-
-void WebMediaCacheManagerProxy::refWebContextSupplement()
-{
- API::Object::ref();
-}
-
-void WebMediaCacheManagerProxy::derefWebContextSupplement()
-{
- API::Object::deref();
-}
-
-void WebMediaCacheManagerProxy::getHostnamesWithMediaCache(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- RefPtr<ArrayCallback> callback = ArrayCallback::create(WTFMove(callbackFunction));
- uint64_t callbackID = callback->callbackID();
- m_arrayCallbacks.set(callbackID, callback.release());
-
- // FIXME (Multi-WebProcess): <rdar://problem/12239765> When we're sending this to multiple processes, we need to aggregate the callback data when it comes back.
- processPool()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebMediaCacheManager::GetHostnamesWithMediaCache(callbackID));
-}
-
-void WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache(const Vector<String>& hostnames, uint64_t callbackID)
-{
- RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
- if (!callback) {
- // FIXME: Log error or assert.
- return;
- }
-
- callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).ptr());
-}
-
-void WebMediaCacheManagerProxy::clearCacheForHostname(const String& hostname)
-{
- processPool()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebMediaCacheManager::ClearCacheForHostname(hostname));
-}
-
-void WebMediaCacheManagerProxy::clearCacheForAllHostnames()
-{
- processPool()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebMediaCacheManager::ClearCacheForAllHostnames());
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,78 +0,0 @@
-/*
- * 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebMediaCacheManagerProxy_h
-#define WebMediaCacheManagerProxy_h
-
-#include "APIObject.h"
-#include "GenericCallback.h"
-#include "MessageReceiver.h"
-#include "WebContextSupplement.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-
-namespace WebKit {
-
-class WebProcessPool;
-class WebProcessProxy;
-
-typedef GenericCallback<API::Array*> ArrayCallback;
-
-class WebMediaCacheManagerProxy : public API::ObjectImpl<API::Object::Type::MediaCacheManager>, public WebContextSupplement, private IPC::MessageReceiver {
-public:
- static const char* supplementName();
-
- static PassRefPtr<WebMediaCacheManagerProxy> create(WebProcessPool*);
- virtual ~WebMediaCacheManagerProxy();
-
- void getHostnamesWithMediaCache(std::function<void (API::Array*, CallbackBase::Error)>);
- void clearCacheForHostname(const String&);
- void clearCacheForAllHostnames();
-
- using API::Object::ref;
- using API::Object::deref;
-
-private:
- explicit WebMediaCacheManagerProxy(WebProcessPool*);
-
- void didGetHostnamesWithMediaCache(const Vector<String>&, uint64_t callbackID);
-
- // WebContextSupplement
- virtual void processPoolDestroyed() override;
- virtual void processDidClose(WebProcessProxy*) override;
- virtual bool shouldTerminate(WebProcessProxy*) const override;
- virtual void refWebContextSupplement() override;
- virtual void derefWebContextSupplement() override;
-
- // IPC::MessageReceiver
- virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-
- HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
-};
-
-} // namespace WebKit
-
-#endif // WebMediaCacheManagerProxy_h
Deleted: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.messages.in (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.messages.in 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.messages.in 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,25 +0,0 @@
-# Copyright (C) 2011 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-messages -> WebMediaCacheManagerProxy {
- DidGetHostnamesWithMediaCache(Vector<String> hostnames, uint64_t callbackID);
-}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (196697 => 196698)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-17 18:15:57 UTC (rev 196698)
@@ -51,7 +51,6 @@
#include "WebGeolocationManagerProxy.h"
#include "WebIconDatabase.h"
#include "WebKit2Initialize.h"
-#include "WebMediaCacheManagerProxy.h"
#include "WebMemorySampler.h"
#include "WebNotificationManagerProxy.h"
#include "WebPageGroup.h"
@@ -179,7 +178,6 @@
addSupplement<WebCookieManagerProxy>();
addSupplement<WebGeolocationManagerProxy>();
- addSupplement<WebMediaCacheManagerProxy>();
addSupplement<WebNotificationManagerProxy>();
#if USE(SOUP)
addSupplement<WebSoupCustomProtocolRequestManager>();
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (196697 => 196698)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-17 18:15:57 UTC (rev 196698)
@@ -740,16 +740,6 @@
3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33AA1064131F060000D4A575 /* WebCookieManagerProxyClient.cpp */; };
33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 33AA1065131F060000D4A575 /* WebCookieManagerProxyClient.h */; };
- 33D3A3B51339600B00709BE4 /* WKMediaCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33D3A3B31339600B00709BE4 /* WKMediaCacheManager.cpp */; };
- 33D3A3B61339600B00709BE4 /* WKMediaCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 33D3A3B41339600B00709BE4 /* WKMediaCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 33D3A3BA1339606200709BE4 /* WebMediaCacheManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33D3A3B71339606200709BE4 /* WebMediaCacheManagerProxy.cpp */; };
- 33D3A3BB1339606200709BE4 /* WebMediaCacheManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 33D3A3B81339606200709BE4 /* WebMediaCacheManagerProxy.h */; };
- 33D3A3C1133960B000709BE4 /* WebMediaCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33D3A3BE133960B000709BE4 /* WebMediaCacheManager.cpp */; };
- 33D3A3C2133960B000709BE4 /* WebMediaCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 33D3A3BF133960B000709BE4 /* WebMediaCacheManager.h */; };
- 33D3A3C81339617900709BE4 /* WebMediaCacheManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33D3A3C41339617900709BE4 /* WebMediaCacheManagerMessageReceiver.cpp */; };
- 33D3A3C91339617900709BE4 /* WebMediaCacheManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 33D3A3C51339617900709BE4 /* WebMediaCacheManagerMessages.h */; };
- 33D3A3CA1339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33D3A3C61339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp */; };
- 33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 33D3A3C71339617900709BE4 /* WebMediaCacheManagerProxyMessages.h */; };
370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 370F34A01829BE1E009027C8 /* WKNavigationData.mm */; };
370F34A31829BE1E009027C8 /* WKNavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = 370F34A11829BE1E009027C8 /* WKNavigationData.h */; settings = {ATTRIBUTES = (Private, ); }; };
370F34A51829BEA3009027C8 /* WKNavigationDataInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 370F34A41829BEA3009027C8 /* WKNavigationDataInternal.h */; };
@@ -2734,18 +2724,6 @@
33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKResourceCacheManager.h; sourceTree = "<group>"; };
33AA1064131F060000D4A575 /* WebCookieManagerProxyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCookieManagerProxyClient.cpp; sourceTree = "<group>"; };
33AA1065131F060000D4A575 /* WebCookieManagerProxyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCookieManagerProxyClient.h; sourceTree = "<group>"; };
- 33D3A3B31339600B00709BE4 /* WKMediaCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMediaCacheManager.cpp; sourceTree = "<group>"; };
- 33D3A3B41339600B00709BE4 /* WKMediaCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMediaCacheManager.h; sourceTree = "<group>"; };
- 33D3A3B71339606200709BE4 /* WebMediaCacheManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaCacheManagerProxy.cpp; sourceTree = "<group>"; };
- 33D3A3B81339606200709BE4 /* WebMediaCacheManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaCacheManagerProxy.h; sourceTree = "<group>"; };
- 33D3A3B91339606200709BE4 /* WebMediaCacheManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebMediaCacheManagerProxy.messages.in; sourceTree = "<group>"; };
- 33D3A3BE133960B000709BE4 /* WebMediaCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebMediaCacheManager.cpp; path = MediaCache/WebMediaCacheManager.cpp; sourceTree = "<group>"; };
- 33D3A3BF133960B000709BE4 /* WebMediaCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebMediaCacheManager.h; path = MediaCache/WebMediaCacheManager.h; sourceTree = "<group>"; };
- 33D3A3C0133960B000709BE4 /* WebMediaCacheManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebMediaCacheManager.messages.in; path = MediaCache/WebMediaCacheManager.messages.in; sourceTree = "<group>"; };
- 33D3A3C41339617900709BE4 /* WebMediaCacheManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaCacheManagerMessageReceiver.cpp; sourceTree = "<group>"; };
- 33D3A3C51339617900709BE4 /* WebMediaCacheManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaCacheManagerMessages.h; sourceTree = "<group>"; };
- 33D3A3C61339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaCacheManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
- 33D3A3C71339617900709BE4 /* WebMediaCacheManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaCacheManagerProxyMessages.h; sourceTree = "<group>"; };
3574B37F1665932C00859BB7 /* PDFAnnotationTextWidgetDetails.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PDFAnnotationTextWidgetDetails.h; path = PDF/PDFAnnotationTextWidgetDetails.h; sourceTree = "<group>"; };
370F34A01829BE1E009027C8 /* WKNavigationData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigationData.mm; sourceTree = "<group>"; };
370F34A11829BE1E009027C8 /* WKNavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationData.h; sourceTree = "<group>"; };
@@ -4925,9 +4903,6 @@
33D3A3BD1339609800709BE4 /* MediaCache */ = {
isa = PBXGroup;
children = (
- 33D3A3BE133960B000709BE4 /* WebMediaCacheManager.cpp */,
- 33D3A3BF133960B000709BE4 /* WebMediaCacheManager.h */,
- 33D3A3C0133960B000709BE4 /* WebMediaCacheManager.messages.in */,
CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */,
CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */,
);
@@ -5919,9 +5894,6 @@
1C8E28331275D73800BC7BD0 /* WebInspectorProxy.cpp */,
1C8E28321275D73800BC7BD0 /* WebInspectorProxy.h */,
1C77C1951288A872006A742F /* WebInspectorProxy.messages.in */,
- 33D3A3B71339606200709BE4 /* WebMediaCacheManagerProxy.cpp */,
- 33D3A3B81339606200709BE4 /* WebMediaCacheManagerProxy.h */,
- 33D3A3B91339606200709BE4 /* WebMediaCacheManagerProxy.messages.in */,
C98C48A31B6FD4C300145103 /* WebMediaSessionFocusManager.cpp */,
C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */,
C9C183371B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.cpp */,
@@ -6074,8 +6046,6 @@
51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */,
51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */,
2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */,
- 33D3A3B31339600B00709BE4 /* WKMediaCacheManager.cpp */,
- 33D3A3B41339600B00709BE4 /* WKMediaCacheManager.h */,
C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */,
C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */,
C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */,
@@ -6924,10 +6894,6 @@
1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */,
1CBBE49E19B66C53006B7D81 /* WebInspectorUIMessageReceiver.cpp */,
1CBBE49F19B66C53006B7D81 /* WebInspectorUIMessages.h */,
- 33D3A3C41339617900709BE4 /* WebMediaCacheManagerMessageReceiver.cpp */,
- 33D3A3C51339617900709BE4 /* WebMediaCacheManagerMessages.h */,
- 33D3A3C61339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp */,
- 33D3A3C71339617900709BE4 /* WebMediaCacheManagerProxyMessages.h */,
31BA9248148830810062EDB5 /* WebNotificationManagerMessageReceiver.cpp */,
31BA9249148830810062EDB5 /* WebNotificationManagerMessages.h */,
29D55DEF161BF9F10031A2E3 /* WebPageGroupProxyMessageReceiver.cpp */,
@@ -7670,10 +7636,6 @@
BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
BC9BA5051697C45300E44616 /* WebKit2Initialize.h in Headers */,
1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */,
- 33D3A3C2133960B000709BE4 /* WebMediaCacheManager.h in Headers */,
- 33D3A3C91339617900709BE4 /* WebMediaCacheManagerMessages.h in Headers */,
- 33D3A3BB1339606200709BE4 /* WebMediaCacheManagerProxy.h in Headers */,
- 33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */,
CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */,
C98C48A61B6FD4C300145103 /* WebMediaSessionFocusManager.h in Headers */,
C9C1833C1B74026D007036A7 /* WebMediaSessionFocusManagerClient.h in Headers */,
@@ -7904,7 +7866,6 @@
6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers */,
51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
- 33D3A3B61339600B00709BE4 /* WKMediaCacheManager.h in Headers */,
C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
BC4075FE124FF0270068F20A /* WKMutableArray.h in Headers */,
@@ -9157,10 +9118,6 @@
C0337DD3127A2A0E008FF4F4 /* WebKeyboardEvent.cpp in Sources */,
1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
BC9BA5041697C45300E44616 /* WebKit2Initialize.cpp in Sources */,
- 33D3A3C1133960B000709BE4 /* WebMediaCacheManager.cpp in Sources */,
- 33D3A3C81339617900709BE4 /* WebMediaCacheManagerMessageReceiver.cpp in Sources */,
- 33D3A3BA1339606200709BE4 /* WebMediaCacheManagerProxy.cpp in Sources */,
- 33D3A3CA1339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp in Sources */,
CD003A5219D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp in Sources */,
C98C48A51B6FD4C300145103 /* WebMediaSessionFocusManager.cpp in Sources */,
C9C1833B1B74026A007036A7 /* WebMediaSessionFocusManagerClient.cpp in Sources */,
@@ -9362,7 +9319,6 @@
A54293A5195A43DD002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm in Sources */,
51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */,
07297F9E1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp in Sources */,
- 33D3A3B51339600B00709BE4 /* WKMediaCacheManager.cpp in Sources */,
C98C48A91B6FD5B500145103 /* WKMediaSessionFocusManager.cpp in Sources */,
C9CD439E1B4B025300239E33 /* WKMediaSessionMetadata.cpp in Sources */,
BC4075FD124FF0270068F20A /* WKMutableArray.cpp in Sources */,
Deleted: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp (196697 => 196698)
--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,76 +0,0 @@
-/*
- * 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebMediaCacheManager.h"
-
-#include "WebMediaCacheManagerMessages.h"
-#include "WebMediaCacheManagerProxyMessages.h"
-#include "WebProcess.h"
-#include <WebCore/HTMLMediaElement.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const char* WebMediaCacheManager::supplementName()
-{
- return "WebMediaCacheManager";
-}
-
-WebMediaCacheManager::WebMediaCacheManager(WebProcess* process)
- : m_process(process)
-{
- m_process->addMessageReceiver(Messages::WebMediaCacheManager::messageReceiverName(), *this);
-}
-
-void WebMediaCacheManager::getHostnamesWithMediaCache(uint64_t callbackID)
-{
- Vector<String> mediaCacheHostnames;
-
-#if ENABLE(VIDEO)
- HTMLMediaElement::getSitesInMediaCache(mediaCacheHostnames);
-#endif
-
- m_process->send(Messages::WebMediaCacheManagerProxy::DidGetHostnamesWithMediaCache(mediaCacheHostnames, callbackID), 0);
-}
-
-void WebMediaCacheManager::clearCacheForHostname(const String& hostname)
-{
-#if ENABLE(VIDEO)
- HTMLMediaElement::clearMediaCacheForSite(hostname);
-#else
- UNUSED_PARAM(hostname);
-#endif
-}
-
-void WebMediaCacheManager::clearCacheForAllHostnames()
-{
-#if ENABLE(VIDEO)
- HTMLMediaElement::clearMediaCache();
-#endif
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h (196697 => 196698)
--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,58 +0,0 @@
-/*
- * 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebMediaCacheManager_h
-#define WebMediaCacheManager_h
-
-#include "MessageReceiver.h"
-#include "WebProcessSupplement.h"
-#include <stdint.h>
-#include <wtf/Forward.h>
-#include <wtf/Noncopyable.h>
-
-namespace WebKit {
-
-class WebProcess;
-
-class WebMediaCacheManager : public WebProcessSupplement, public IPC::MessageReceiver {
- WTF_MAKE_NONCOPYABLE(WebMediaCacheManager);
-public:
- explicit WebMediaCacheManager(WebProcess*);
-
- static const char* supplementName();
-
-private:
- virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-
- void getHostnamesWithMediaCache(uint64_t callbackID);
- void clearCacheForHostname(const String&);
- void clearCacheForAllHostnames();
-
- WebProcess* m_process;
-};
-
-} // namespace WebKit
-
-#endif // WebMediaCacheManager_h
Deleted: trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.messages.in (196697 => 196698)
--- trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.messages.in 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.messages.in 2016-02-17 18:15:57 UTC (rev 196698)
@@ -1,27 +0,0 @@
-# Copyright (C) 2011 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-messages -> WebMediaCacheManager {
- void GetHostnamesWithMediaCache(uint64_t callbackID)
- void ClearCacheForHostname(String hostname)
- void ClearCacheForAllHostnames()
-}
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (196697 => 196698)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-02-17 17:46:00 UTC (rev 196697)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-02-17 18:15:57 UTC (rev 196698)
@@ -49,7 +49,6 @@
#include "WebGeolocationManager.h"
#include "WebIconDatabaseProxy.h"
#include "WebLoaderStrategy.h"
-#include "WebMediaCacheManager.h"
#include "WebMediaKeyStorageManager.h"
#include "WebMemorySampler.h"
#include "WebPage.h"
@@ -179,7 +178,6 @@
// limited.
addSupplement<WebGeolocationManager>();
addSupplement<WebCookieManager>();
- addSupplement<WebMediaCacheManager>();
addSupplement<AuthenticationManager>();
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
