Diff
Modified: trunk/Source/WebKit2/ChangeLog (185600 => 185601)
--- trunk/Source/WebKit2/ChangeLog 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-16 19:43:11 UTC (rev 185601)
@@ -1,3 +1,46 @@
+2015-06-16 Anders Carlsson <ander...@apple.com>
+
+ Get rid of the application cache manager classes, they are no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=146024
+
+ Reviewed by Sam Weinig.
+
+ * DerivedSources.make:
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKContext.cpp:
+ * UIProcess/WebApplicationCacheManagerProxy.cpp: Removed.
+ (WebKit::WebApplicationCacheManagerProxy::supplementName): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::create): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::WebApplicationCacheManagerProxy): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::~WebApplicationCacheManagerProxy): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::processPoolDestroyed): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::processDidClose): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::shouldTerminate): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::refWebContextSupplement): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::derefWebContextSupplement): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::getApplicationCacheOrigins): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::didGetApplicationCacheOrigins): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::deleteEntriesForOrigin): Deleted.
+ (WebKit::WebApplicationCacheManagerProxy::deleteAllEntries): Deleted.
+ * UIProcess/WebApplicationCacheManagerProxy.h: Removed.
+ * UIProcess/WebApplicationCacheManagerProxy.messages.in: Removed.
+ * UIProcess/WebProcessPool.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp: Removed.
+ (WebKit::WebApplicationCacheManager::supplementName): Deleted.
+ (WebKit::WebApplicationCacheManager::WebApplicationCacheManager): Deleted.
+ (WebKit::WebApplicationCacheManager::getApplicationCacheOrigins): Deleted.
+ (WebKit::WebApplicationCacheManager::deleteEntriesForOrigin): Deleted.
+ (WebKit::WebApplicationCacheManager::deleteAllEntries): Deleted.
+ (WebKit::WebApplicationCacheManager::setAppCacheMaximumSize): Deleted.
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.h: Removed.
+ * WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in: Removed.
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::clearApplicationCache):
+ (WebKit::InjectedBundle::setAppCacheMaximumSize):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess): Deleted.
+
2015-06-16 Brady Eidson <beid...@apple.com>
IDB: Records table migration doesn't work with all versions of SQLite.
Modified: trunk/Source/WebKit2/DerivedSources.make (185600 => 185601)
--- trunk/Source/WebKit2/DerivedSources.make 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/DerivedSources.make 2015-06-16 19:43:11 UTC (rev 185601)
@@ -105,8 +105,6 @@
ViewUpdateDispatcher \
VisitedLinkProvider \
VisitedLinkTableController \
- WebApplicationCacheManager \
- WebApplicationCacheManagerProxy \
WebConnection \
WebCookieManager \
WebCookieManagerProxy \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (185600 => 185601)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-06-16 19:43:11 UTC (rev 185601)
@@ -74,7 +74,6 @@
class GeolocationPermissionRequestProxy;
class NotificationPermissionRequest;
class UserMediaPermissionRequestProxy;
-class WebApplicationCacheManagerProxy;
class WebBackForwardList;
class WebBackForwardListItem;
class WebBatteryManagerProxy;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (185600 => 185601)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-16 19:43:11 UTC (rev 185601)
@@ -45,7 +45,6 @@
#include <wtf/text/WTFString.h>
// Supplements
-#include "WebApplicationCacheManagerProxy.h"
#include "WebCookieManagerProxy.h"
#include "WebDatabaseManagerProxy.h"
#include "WebGeolocationManagerProxy.h"
Deleted: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp (185600 => 185601)
--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2015-06-16 19:43:11 UTC (rev 185601)
@@ -1,128 +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 "WebApplicationCacheManagerProxy.h"
-
-#include "APISecurityOrigin.h"
-#include "SecurityOriginData.h"
-#include "WebApplicationCacheManagerMessages.h"
-#include "WebApplicationCacheManagerProxyMessages.h"
-#include "WebProcessPool.h"
-
-namespace WebKit {
-
-const char* WebApplicationCacheManagerProxy::supplementName()
-{
- return "WebApplicationCacheManagerProxy";
-}
-
-PassRefPtr<WebApplicationCacheManagerProxy> WebApplicationCacheManagerProxy::create(WebProcessPool* processPool)
-{
- return adoptRef(new WebApplicationCacheManagerProxy(processPool));
-}
-
-WebApplicationCacheManagerProxy::WebApplicationCacheManagerProxy(WebProcessPool* processPool)
- : WebContextSupplement(processPool)
-{
- processPool->addMessageReceiver(Messages::WebApplicationCacheManagerProxy::messageReceiverName(), *this);
-}
-
-WebApplicationCacheManagerProxy::~WebApplicationCacheManagerProxy()
-{
-}
-
-
-void WebApplicationCacheManagerProxy::processPoolDestroyed()
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
-}
-
-void WebApplicationCacheManagerProxy::processDidClose(WebProcessProxy*)
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
-}
-
-bool WebApplicationCacheManagerProxy::shouldTerminate(WebProcessProxy*) const
-{
- return m_arrayCallbacks.isEmpty();
-}
-
-void WebApplicationCacheManagerProxy::refWebContextSupplement()
-{
- API::Object::ref();
-}
-
-void WebApplicationCacheManagerProxy::derefWebContextSupplement()
-{
- API::Object::deref();
-}
-
-void WebApplicationCacheManagerProxy::getApplicationCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- RefPtr<ArrayCallback> callback = ArrayCallback::create(WTF::move(callbackFunction));
-
- if (!processPool()) {
- callback->invalidate();
- return;
- }
-
- uint64_t callbackID = callback->callbackID();
- m_arrayCallbacks.set(callbackID, callback.release());
-
- // FIXME (Multi-WebProcess): <rdar://problem/12239765> Make manipulating cache information work with per-tab WebProcess.
- processPool()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebApplicationCacheManager::GetApplicationCacheOrigins(callbackID));
-}
-
-void WebApplicationCacheManagerProxy::didGetApplicationCacheOrigins(const Vector<SecurityOriginData>& originDatas, uint64_t callbackID)
-{
- RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
- performAPICallbackWithSecurityOriginDataVector(originDatas, callback.get());
-}
-
-void WebApplicationCacheManagerProxy::deleteEntriesForOrigin(API::SecurityOrigin* origin)
-{
- if (!processPool())
- return;
-
- SecurityOriginData securityOriginData;
- securityOriginData.protocol = origin->securityOrigin().protocol();
- securityOriginData.host = origin->securityOrigin().host();
- securityOriginData.port = origin->securityOrigin().port();
-
- // FIXME (Multi-WebProcess): <rdar://problem/12239765> Make manipulating cache information work with per-tab WebProcess.
- processPool()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebApplicationCacheManager::DeleteEntriesForOrigin(securityOriginData));
-}
-
-void WebApplicationCacheManagerProxy::deleteAllEntries()
-{
- if (!processPool())
- return;
-
- // FIXME (Multi-WebProcess): <rdar://problem/12239765> Make manipulating cache information work with per-tab WebProcess.
- processPool()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebApplicationCacheManager::DeleteAllEntries());
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h (185600 => 185601)
--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h 2015-06-16 19:43:11 UTC (rev 185601)
@@ -1,82 +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 WebApplicationCacheManagerProxy_h
-#define WebApplicationCacheManagerProxy_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 IPC {
-class Connection;
-}
-
-namespace WebKit {
-
-class WebProcessPool;
-struct SecurityOriginData;
-
-typedef GenericCallback<API::Array*> ArrayCallback;
-
-class WebApplicationCacheManagerProxy : public API::ObjectImpl<API::Object::Type::ApplicationCacheManager>, public WebContextSupplement, private IPC::MessageReceiver {
-public:
- static const char* supplementName();
-
- static PassRefPtr<WebApplicationCacheManagerProxy> create(WebProcessPool*);
- virtual ~WebApplicationCacheManagerProxy();
-
- void getApplicationCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
- void deleteEntriesForOrigin(API::SecurityOrigin*);
- void deleteAllEntries();
-
- using API::Object::ref;
- using API::Object::deref;
-
-private:
- explicit WebApplicationCacheManagerProxy(WebProcessPool*);
-
- void didGetApplicationCacheOrigins(const Vector<SecurityOriginData>&, 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 // WebApplicationCacheManagerProxy_h
Deleted: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.messages.in (185600 => 185601)
--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.messages.in 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.messages.in 2015-06-16 19:43:11 UTC (rev 185601)
@@ -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 -> WebApplicationCacheManagerProxy {
- DidGetApplicationCacheOrigins(Vector<WebKit::SecurityOriginData> originIdentifiers, uint64_t callbackID);
-}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (185600 => 185601)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-16 19:43:11 UTC (rev 185601)
@@ -38,7 +38,6 @@
#include "StatisticsData.h"
#include "TextChecker.h"
#include "WKContextPrivate.h"
-#include "WebApplicationCacheManagerProxy.h"
#include "WebCertificateInfo.h"
#include "WebContextSupplement.h"
#include "WebCookieManagerProxy.h"
@@ -193,7 +192,6 @@
// NOTE: These sub-objects must be initialized after m_messageReceiverMap..
m_iconDatabase = WebIconDatabase::create(this);
- addSupplement<WebApplicationCacheManagerProxy>();
addSupplement<WebCookieManagerProxy>();
addSupplement<WebGeolocationManagerProxy>();
addSupplement<WebKeyValueStorageManager>();
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185600 => 185601)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-16 19:43:11 UTC (rev 185601)
@@ -908,14 +908,6 @@
512A976A180E09B80039A149 /* DatabaseProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */; };
512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; };
512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 512E3524130B550600ABD19A /* WebApplicationCacheManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */; };
- 512E3525130B550600ABD19A /* WebApplicationCacheManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */; };
- 512E352E130B55AF00ABD19A /* WebApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */; };
- 512E352F130B55AF00ABD19A /* WebApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E352C130B55AF00ABD19A /* WebApplicationCacheManager.h */; };
- 512E356A130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */; };
- 512E356B130B57F000ABD19A /* WebApplicationCacheManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */; };
- 512E35F8130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512E35F6130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp */; };
- 512E35F9130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512E35F7130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h */; };
512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */; };
512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */; };
512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F589012A8838800629530 /* AuthenticationDecisionListener.cpp */; };
@@ -3103,16 +3095,6 @@
512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = DatabaseProcessProxy.messages.in; path = Databases/DatabaseProcessProxy.messages.in; sourceTree = "<group>"; };
512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; };
512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessProxyMessages.h; sourceTree = "<group>"; };
- 512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebApplicationCacheManagerProxy.cpp; sourceTree = "<group>"; };
- 512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheManagerProxy.h; sourceTree = "<group>"; };
- 512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebApplicationCacheManager.cpp; path = ApplicationCache/WebApplicationCacheManager.cpp; sourceTree = "<group>"; };
- 512E352C130B55AF00ABD19A /* WebApplicationCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebApplicationCacheManager.h; path = ApplicationCache/WebApplicationCacheManager.h; sourceTree = "<group>"; };
- 512E352D130B55AF00ABD19A /* WebApplicationCacheManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebApplicationCacheManager.messages.in; path = ApplicationCache/WebApplicationCacheManager.messages.in; sourceTree = "<group>"; };
- 512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebApplicationCacheManagerMessageReceiver.cpp; sourceTree = "<group>"; };
- 512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheManagerMessages.h; sourceTree = "<group>"; };
- 512E35F0130B638C00ABD19A /* WebApplicationCacheManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebApplicationCacheManagerProxy.messages.in; sourceTree = "<group>"; };
- 512E35F6130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebApplicationCacheManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
- 512E35F7130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheManagerProxyMessages.h; sourceTree = "<group>"; };
512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeProxy.cpp; sourceTree = "<group>"; };
512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeProxy.h; sourceTree = "<group>"; };
512F589012A8838800629530 /* AuthenticationDecisionListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationDecisionListener.cpp; sourceTree = "<group>"; };
@@ -5652,16 +5634,6 @@
path = Databases;
sourceTree = "<group>";
};
- 512E352A130B559900ABD19A /* ApplicationCache */ = {
- isa = PBXGroup;
- children = (
- 512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */,
- 512E352C130B55AF00ABD19A /* WebApplicationCacheManager.h */,
- 512E352D130B55AF00ABD19A /* WebApplicationCacheManager.messages.in */,
- );
- name = ApplicationCache;
- sourceTree = "<group>";
- };
512F588D12A8836F00629530 /* Authentication */ = {
isa = PBXGroup;
children = (
@@ -6001,7 +5973,6 @@
BC032D5C10F436D50058C15A /* WebProcess */ = {
isa = PBXGroup;
children = (
- 512E352A130B559900ABD19A /* ApplicationCache */,
7C6E70F818B2D47E00F24E2E /* cocoa */,
3309344B1315B93A0097A7BC /* Cookies */,
512A9754180DF9270039A149 /* Databases */,
@@ -6193,9 +6164,6 @@
1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */,
1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */,
1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */,
- 512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */,
- 512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */,
- 512E35F0130B638C00ABD19A /* WebApplicationCacheManagerProxy.messages.in */,
BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */,
BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */,
F036978715F4BF0500C3A80E /* WebColorPicker.cpp */,
@@ -7300,10 +7268,6 @@
1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */,
1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */,
1A8E7D3B18C15149005A702A /* VisitedLinkTableControllerMessages.h */,
- 512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */,
- 512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */,
- 512E35F6130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp */,
- 512E35F7130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h */,
1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */,
1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */,
330934431315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp */,
@@ -7986,10 +7950,6 @@
1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */,
1AA9BAE1184FFAC7003B6BC6 /* WeakObjCPtr.h in Headers */,
CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */,
- 512E352F130B55AF00ABD19A /* WebApplicationCacheManager.h in Headers */,
- 512E356B130B57F000ABD19A /* WebApplicationCacheManagerMessages.h in Headers */,
- 512E3525130B550600ABD19A /* WebApplicationCacheManagerProxy.h in Headers */,
- 512E35F9130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h in Headers */,
BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */,
BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */,
@@ -9808,10 +9768,6 @@
1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */,
1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */,
CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */,
- 512E352E130B55AF00ABD19A /* WebApplicationCacheManager.cpp in Sources */,
- 512E356A130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp in Sources */,
- 512E3524130B550600ABD19A /* WebApplicationCacheManagerProxy.cpp in Sources */,
- 512E35F8130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp in Sources */,
BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (185600 => 185601)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-06-16 19:43:11 UTC (rev 185601)
@@ -35,7 +35,6 @@
#include "UserData.h"
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
-#include "WebApplicationCacheManager.h"
#include "WebConnectionToUIProcess.h"
#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
@@ -353,7 +352,7 @@
void InjectedBundle::clearApplicationCache()
{
- WebProcess::singleton().supplement<WebApplicationCacheManager>()->deleteAllEntries();
+ ApplicationCacheStorage::singleton().deleteAllEntries();
}
void InjectedBundle::clearApplicationCacheForOrigin(const String& originString)
@@ -363,7 +362,7 @@
void InjectedBundle::setAppCacheMaximumSize(uint64_t size)
{
- WebProcess::singleton().supplement<WebApplicationCacheManager>()->setAppCacheMaximumSize(size);
+ ApplicationCacheStorage::singleton().setMaximumSize(size);
}
uint64_t InjectedBundle::appCacheUsageForOrigin(const String& originString)
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (185600 => 185601)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-06-16 19:17:40 UTC (rev 185600)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-06-16 19:43:11 UTC (rev 185601)
@@ -40,7 +40,6 @@
#include "SessionTracker.h"
#include "StatisticsData.h"
#include "UserData.h"
-#include "WebApplicationCacheManager.h"
#include "WebConnectionToUIProcess.h"
#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
@@ -184,7 +183,6 @@
// so that ports have a chance to customize, and ifdefs in this file are
// limited.
addSupplement<WebGeolocationManager>();
- addSupplement<WebApplicationCacheManager>();
addSupplement<WebResourceCacheManager>();
addSupplement<WebCookieManager>();
addSupplement<WebMediaCacheManager>();
