<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185601] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185601">185601</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 12:43:11 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxyh">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxymessagesin">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.messages.in</a></li>
<li>trunk/Source/WebKit2/WebProcess/ApplicationCache/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-06-16 Anders Carlsson <andersca@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.
+
</ins><span class="cx"> 2015-06-16 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: Records table migration doesn't work with all versions of SQLite.
</span></span></pre></div>
<a id="trunkSourceWebKit2DerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DerivedSources.make (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -105,8 +105,6 @@
</span><span class="cx"> ViewUpdateDispatcher \
</span><span class="cx"> VisitedLinkProvider \
</span><span class="cx"> VisitedLinkTableController \
</span><del>- WebApplicationCacheManager \
- WebApplicationCacheManagerProxy \
</del><span class="cx"> WebConnection \
</span><span class="cx"> WebCookieManager \
</span><span class="cx"> WebCookieManagerProxy \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> class GeolocationPermissionRequestProxy;
</span><span class="cx"> class NotificationPermissionRequest;
</span><span class="cx"> class UserMediaPermissionRequestProxy;
</span><del>-class WebApplicationCacheManagerProxy;
</del><span class="cx"> class WebBackForwardList;
</span><span class="cx"> class WebBackForwardListItem;
</span><span class="cx"> class WebBatteryManagerProxy;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> // Supplements
</span><del>-#include "WebApplicationCacheManagerProxy.h"
</del><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebDatabaseManagerProxy.h"
</span><span class="cx"> #include "WebGeolocationManagerProxy.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,128 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxymessagesin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.messages.in (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-# 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);
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "TextChecker.h"
</span><span class="cx"> #include "WKContextPrivate.h"
</span><del>-#include "WebApplicationCacheManagerProxy.h"
</del><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="cx"> #include "WebContextSupplement.h"
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="lines">@@ -193,7 +192,6 @@
</span><span class="cx"> // NOTE: These sub-objects must be initialized after m_messageReceiverMap..
</span><span class="cx"> m_iconDatabase = WebIconDatabase::create(this);
</span><span class="cx">
</span><del>- addSupplement<WebApplicationCacheManagerProxy>();
</del><span class="cx"> addSupplement<WebCookieManagerProxy>();
</span><span class="cx"> addSupplement<WebGeolocationManagerProxy>();
</span><span class="cx"> addSupplement<WebKeyValueStorageManager>();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -908,14 +908,6 @@
</span><span class="cx">                 512A976A180E09B80039A149 /* DatabaseProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */; };
</span><span class="cx">                 512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; };
</span><span class="cx">                 512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-                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 */; };
</del><span class="cx">                 512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */; };
</span><span class="cx">                 512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */; };
</span><span class="cx">                 512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F589012A8838800629530 /* AuthenticationDecisionListener.cpp */; };
</span><span class="lines">@@ -3103,16 +3095,6 @@
</span><span class="cx">                 512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = DatabaseProcessProxy.messages.in; path = Databases/DatabaseProcessProxy.messages.in; sourceTree = "<group>"; };
</span><span class="cx">                 512A9767180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessProxyMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx">                 512A9768180E09B80039A149 /* DatabaseProcessProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessProxyMessages.h; sourceTree = "<group>"; };
</span><del>-                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>"; };
</del><span class="cx">                 512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationChallengeProxy.cpp; sourceTree = "<group>"; };
</span><span class="cx">                 512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeProxy.h; sourceTree = "<group>"; };
</span><span class="cx">                 512F589012A8838800629530 /* AuthenticationDecisionListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationDecisionListener.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5652,16 +5634,6 @@
</span><span class="cx">                         path = Databases;
</span><span class="cx">                         sourceTree = "<group>";
</span><span class="cx">                 };
</span><del>-                512E352A130B559900ABD19A /* ApplicationCache */ = {
-                        isa = PBXGroup;
-                        children = (
-                                512E352B130B55AF00ABD19A /* WebApplicationCacheManager.cpp */,
-                                512E352C130B55AF00ABD19A /* WebApplicationCacheManager.h */,
-                                512E352D130B55AF00ABD19A /* WebApplicationCacheManager.messages.in */,
-                        );
-                        name = ApplicationCache;
-                        sourceTree = "<group>";
-                };
</del><span class="cx">                 512F588D12A8836F00629530 /* Authentication */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><span class="lines">@@ -6001,7 +5973,6 @@
</span><span class="cx">                 BC032D5C10F436D50058C15A /* WebProcess */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><del>-                                512E352A130B559900ABD19A /* ApplicationCache */,
</del><span class="cx">                                 7C6E70F818B2D47E00F24E2E /* cocoa */,
</span><span class="cx">                                 3309344B1315B93A0097A7BC /* Cookies */,
</span><span class="cx">                                 512A9754180DF9270039A149 /* Databases */,
</span><span class="lines">@@ -6193,9 +6164,6 @@
</span><span class="cx">                                 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */,
</span><span class="cx">                                 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */,
</span><span class="cx">                                 1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */,
</span><del>-                                512E3520130B550100ABD19A /* WebApplicationCacheManagerProxy.cpp */,
-                                512E3521130B550100ABD19A /* WebApplicationCacheManagerProxy.h */,
-                                512E35F0130B638C00ABD19A /* WebApplicationCacheManagerProxy.messages.in */,
</del><span class="cx">                                 BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */,
</span><span class="cx">                                 BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */,
</span><span class="cx">                                 F036978715F4BF0500C3A80E /* WebColorPicker.cpp */,
</span><span class="lines">@@ -7300,10 +7268,6 @@
</span><span class="cx">                                 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */,
</span><span class="cx">                                 1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */,
</span><span class="cx">                                 1A8E7D3B18C15149005A702A /* VisitedLinkTableControllerMessages.h */,
</span><del>-                                512E3568130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp */,
-                                512E3569130B57F000ABD19A /* WebApplicationCacheManagerMessages.h */,
-                                512E35F6130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp */,
-                                512E35F7130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h */,
</del><span class="cx">                                 1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */,
</span><span class="cx">                                 1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */,
</span><span class="cx">                                 330934431315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp */,
</span><span class="lines">@@ -7986,10 +7950,6 @@
</span><span class="cx">                                 1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */,
</span><span class="cx">                                 1AA9BAE1184FFAC7003B6BC6 /* WeakObjCPtr.h in Headers */,
</span><span class="cx">                                 CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */,
</span><del>-                                512E352F130B55AF00ABD19A /* WebApplicationCacheManager.h in Headers */,
-                                512E356B130B57F000ABD19A /* WebApplicationCacheManagerMessages.h in Headers */,
-                                512E3525130B550600ABD19A /* WebApplicationCacheManagerProxy.h in Headers */,
-                                512E35F9130B642E00ABD19A /* WebApplicationCacheManagerProxyMessages.h in Headers */,
</del><span class="cx">                                 BC72BA1E11E64907001EB4EA /* WebBackForwardList.h in Headers */,
</span><span class="cx">                                 518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */,
</span><span class="cx">                                 BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */,
</span><span class="lines">@@ -9808,10 +9768,6 @@
</span><span class="cx">                                 1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */,
</span><span class="cx">                                 1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */,
</span><span class="cx">                                 CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */,
</span><del>-                                512E352E130B55AF00ABD19A /* WebApplicationCacheManager.cpp in Sources */,
-                                512E356A130B57F000ABD19A /* WebApplicationCacheManagerMessageReceiver.cpp in Sources */,
-                                512E3524130B550600ABD19A /* WebApplicationCacheManagerProxy.cpp in Sources */,
-                                512E35F8130B642E00ABD19A /* WebApplicationCacheManagerProxyMessageReceiver.cpp in Sources */,
</del><span class="cx">                                 BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
</span><span class="cx">                                 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
</span><span class="cx">                                 BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "UserData.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><del>-#include "WebApplicationCacheManager.h"
</del><span class="cx"> #include "WebConnectionToUIProcess.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="lines">@@ -353,7 +352,7 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearApplicationCache()
</span><span class="cx"> {
</span><del>- WebProcess::singleton().supplement<WebApplicationCacheManager>()->deleteAllEntries();
</del><ins>+ ApplicationCacheStorage::singleton().deleteAllEntries();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::clearApplicationCacheForOrigin(const String& originString)
</span><span class="lines">@@ -363,7 +362,7 @@
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setAppCacheMaximumSize(uint64_t size)
</span><span class="cx"> {
</span><del>- WebProcess::singleton().supplement<WebApplicationCacheManager>()->setAppCacheMaximumSize(size);
</del><ins>+ ApplicationCacheStorage::singleton().setMaximumSize(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t InjectedBundle::appCacheUsageForOrigin(const String& originString)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (185600 => 185601)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "UserData.h"
</span><del>-#include "WebApplicationCacheManager.h"
</del><span class="cx"> #include "WebConnectionToUIProcess.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="lines">@@ -184,7 +183,6 @@
</span><span class="cx"> // so that ports have a chance to customize, and ifdefs in this file are
</span><span class="cx"> // limited.
</span><span class="cx"> addSupplement<WebGeolocationManager>();
</span><del>- addSupplement<WebApplicationCacheManager>();
</del><span class="cx"> addSupplement<WebResourceCacheManager>();
</span><span class="cx"> addSupplement<WebCookieManager>();
</span><span class="cx"> addSupplement<WebMediaCacheManager>();
</span></span></pre>
</div>
</div>
</body>
</html>