<!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>[180963] trunk/Source</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/180963">180963</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-03 16:10:08 -0800 (Tue, 03 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Access ApplicationCacheStorage global instance via singleton() static member function
https://bugs.webkit.org/show_bug.cgi?id=142239
Reviewed by Anders Carlsson.
Access ApplicationCacheStorage global instance via singleton() static
member function as per WebKit coding style.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCachecpp">trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStorageh">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCachemm">trunk/Source/WebKit/mac/Misc/WebCache.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebApplicationCachemm">trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebApplicationCacheQuotaManagermm">trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebApplicationCachecpp">trunk/Source/WebKit/win/WebApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCachecpp">trunk/Source/WebKit/win/WebCache.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp">trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebCore/ChangeLog 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-03 Chris Dumez <cdumez@apple.com>
+
+ Access ApplicationCacheStorage global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=142239
+
+ Reviewed by Anders Carlsson.
+
+ Access ApplicationCacheStorage global instance via singleton() static
+ member function as per WebKit coding style.
+
</ins><span class="cx"> 2015-03-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the build.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> ASSERT(resource->type() & ApplicationCacheResource::Master);
</span><span class="cx">
</span><span class="cx"> // Add the resource to the storage.
</span><del>- cacheStorage().store(resource.get(), this);
</del><ins>+ ApplicationCacheStorage::singleton().store(resource.get(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_estimatedSizeInStorage += resource->estimatedSizeInStorage();
</span><span class="lines">@@ -192,8 +192,10 @@
</span><span class="cx">
</span><span class="cx"> void ApplicationCache::deleteCacheForOrigin(SecurityOrigin* origin)
</span><span class="cx"> {
</span><ins>+ auto& cacheStorage = ApplicationCacheStorage::singleton();
+
</ins><span class="cx"> Vector<URL> urls;
</span><del>- if (!cacheStorage().getManifestURLs(&urls)) {
</del><ins>+ if (!cacheStorage.getManifestURLs(&urls)) {
</ins><span class="cx"> LOG_ERROR("Failed to retrieve ApplicationCache manifest URLs");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -203,11 +205,11 @@
</span><span class="cx"> size_t count = urls.size();
</span><span class="cx"> for (size_t i = 0; i < count; ++i) {
</span><span class="cx"> if (protocolHostAndPortAreEqual(urls[i], originURL)) {
</span><del>- ApplicationCacheGroup* group = cacheStorage().findInMemoryCacheGroup(urls[i]);
</del><ins>+ ApplicationCacheGroup* group = cacheStorage.findInMemoryCacheGroup(urls[i]);
</ins><span class="cx"> if (group)
</span><span class="cx"> group->makeObsolete();
</span><span class="cx"> else
</span><del>- cacheStorage().deleteCacheGroup(urls[i]);
</del><ins>+ cacheStorage.deleteCacheGroup(urls[i]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -216,17 +218,18 @@
</span><span class="cx"> {
</span><span class="cx"> HashSet<RefPtr<SecurityOrigin>> origins;
</span><span class="cx">
</span><del>- cacheStorage().getOriginsWithCache(origins);
</del><ins>+ auto& cacheStorage = ApplicationCacheStorage::singleton();
+ cacheStorage.getOriginsWithCache(origins);
</ins><span class="cx"> for (auto& origin : origins)
</span><span class="cx"> deleteCacheForOrigin(origin.get());
</span><span class="cx">
</span><del>- cacheStorage().vacuumDatabaseFile();
</del><ins>+ cacheStorage.vacuumDatabaseFile();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int64_t ApplicationCache::diskUsageForOrigin(SecurityOrigin* origin)
</span><span class="cx"> {
</span><span class="cx"> int64_t usage = 0;
</span><del>- cacheStorage().calculateUsageForOrigin(origin, usage);
</del><ins>+ ApplicationCacheStorage::singleton().calculateUsageForOrigin(origin, usage);
</ins><span class="cx"> return usage;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> stopLoading();
</span><span class="cx">
</span><del>- cacheStorage().cacheGroupDestroyed(this);
</del><ins>+ ApplicationCacheStorage::singleton().cacheGroupDestroyed(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCache* ApplicationCacheGroup::cacheForMainRequest(const ResourceRequest& request, DocumentLoader* documentLoader)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> if (documentLoader->frame() && documentLoader->frame()->page()->usesEphemeralSession())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (ApplicationCacheGroup* group = cacheStorage().cacheGroupForURL(url)) {
</del><ins>+ if (ApplicationCacheGroup* group = ApplicationCacheStorage::singleton().cacheGroupForURL(url)) {
</ins><span class="cx"> ASSERT(group->newestCache());
</span><span class="cx"> ASSERT(!group->isObsolete());
</span><span class="cx">
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> if (url.hasFragmentIdentifier())
</span><span class="cx"> url.removeFragmentIdentifier();
</span><span class="cx">
</span><del>- if (ApplicationCacheGroup* group = cacheStorage().fallbackCacheGroupForURL(url)) {
</del><ins>+ if (ApplicationCacheGroup* group = ApplicationCacheStorage::singleton().fallbackCacheGroupForURL(url)) {
</ins><span class="cx"> ASSERT(group->newestCache());
</span><span class="cx"> ASSERT(!group->isObsolete());
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> bool inStorage = resource->storageID();
</span><span class="cx"> resource->addType(ApplicationCacheResource::Foreign);
</span><span class="cx"> if (inStorage)
</span><del>- cacheStorage().storeUpdatedType(resource, mainResourceCache);
</del><ins>+ ApplicationCacheStorage::singleton().storeUpdatedType(resource, mainResourceCache);
</ins><span class="cx">
</span><span class="cx"> // Restart the current navigation from the top of the navigation algorithm, undoing any changes that were made
</span><span class="cx"> // as part of the initial load.
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> if (!protocolHostAndPortAreEqual(manifestURL, request.url()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ApplicationCacheGroup* group = cacheStorage().findOrCreateCacheGroup(manifestURL);
</del><ins>+ ApplicationCacheGroup* group = ApplicationCacheStorage::singleton().findOrCreateCacheGroup(manifestURL);
</ins><span class="cx">
</span><span class="cx"> documentLoader->applicationCacheHost()->setCandidateApplicationCacheGroup(group);
</span><span class="cx"> group->m_pendingMasterResourceLoaders.add(documentLoader);
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isObsolete = true;
</span><del>- cacheStorage().cacheGroupMadeObsolete(this);
</del><ins>+ ApplicationCacheStorage::singleton().cacheGroupMadeObsolete(this);
</ins><span class="cx"> ASSERT(!m_storageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -773,7 +773,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_frame);
</span><span class="cx"> ASSERT(m_cacheBeingUpdated);
</span><del>- m_frame->page()->chrome().client().reachedMaxAppCacheSize(cacheStorage().spaceNeeded(m_cacheBeingUpdated->estimatedSizeInStorage()));
</del><ins>+ m_frame->page()->chrome().client().reachedMaxAppCacheSize(ApplicationCacheStorage::singleton().spaceNeeded(m_cacheBeingUpdated->estimatedSizeInStorage()));
</ins><span class="cx"> m_calledReachedMaxAppCacheSize = true;
</span><span class="cx"> checkIfLoadIsComplete();
</span><span class="cx"> }
</span><span class="lines">@@ -797,7 +797,7 @@
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheGroup::recalculateAvailableSpaceInQuota()
</span><span class="cx"> {
</span><del>- if (!cacheStorage().calculateRemainingSizeForOriginExcludingCache(m_origin.get(), m_newestCache.get(), m_availableSpaceInQuota)) {
</del><ins>+ if (!ApplicationCacheStorage::singleton().calculateRemainingSizeForOriginExcludingCache(m_origin.get(), m_newestCache.get(), m_availableSpaceInQuota)) {
</ins><span class="cx"> // Failed to determine what is left in the quota. Fallback to allowing anything.
</span><span class="cx"> m_availableSpaceInQuota = ApplicationCacheStorage::noQuota();
</span><span class="cx"> }
</span><span class="lines">@@ -854,7 +854,7 @@
</span><span class="cx">
</span><span class="cx"> // The storage could have been manually emptied by the user.
</span><span class="cx"> if (!m_storageID)
</span><del>- cacheStorage().storeNewestCache(this);
</del><ins>+ ApplicationCacheStorage::singleton().storeNewestCache(this);
</ins><span class="cx">
</span><span class="cx"> postListenerTask(ApplicationCacheHost::NOUPDATE_EVENT, m_associatedDocumentLoaders);
</span><span class="cx"> break;
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx"> // the maximum size. In such a case, m_manifestResource may be 0, as
</span><span class="cx"> // the manifest was already set on the newest cache object.
</span><span class="cx"> ASSERT(m_cacheBeingUpdated->manifestResource());
</span><del>- ASSERT(cacheStorage().isMaximumSizeReached());
</del><ins>+ ASSERT(ApplicationCacheStorage::singleton().isMaximumSizeReached());
</ins><span class="cx"> ASSERT(m_calledReachedMaxAppCacheSize);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -888,15 +888,16 @@
</span><span class="cx"> // If we exceeded the origin quota while downloading we can request a quota
</span><span class="cx"> // increase now, before we attempt to store the cache.
</span><span class="cx"> int64_t totalSpaceNeeded;
</span><del>- if (!cacheStorage().checkOriginQuota(this, oldNewestCache.get(), m_cacheBeingUpdated.get(), totalSpaceNeeded))
</del><ins>+ auto& cacheStorage = ApplicationCacheStorage::singleton();
+ if (!cacheStorage.checkOriginQuota(this, oldNewestCache.get(), m_cacheBeingUpdated.get(), totalSpaceNeeded))
</ins><span class="cx"> didReachOriginQuota(totalSpaceNeeded);
</span><span class="cx">
</span><span class="cx"> ApplicationCacheStorage::FailureReason failureReason;
</span><span class="cx"> setNewestCache(m_cacheBeingUpdated.release());
</span><del>- if (cacheStorage().storeNewestCache(this, oldNewestCache.get(), failureReason)) {
</del><ins>+ if (cacheStorage.storeNewestCache(this, oldNewestCache.get(), failureReason)) {
</ins><span class="cx"> // New cache stored, now remove the old cache.
</span><span class="cx"> if (oldNewestCache)
</span><del>- cacheStorage().remove(oldNewestCache.get());
</del><ins>+ cacheStorage.remove(oldNewestCache.get());
</ins><span class="cx">
</span><span class="cx"> // Fire the final progress event.
</span><span class="cx"> ASSERT(m_progressDone == m_progressTotal);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -1584,7 +1584,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ApplicationCacheStorage& cacheStorage()
</del><ins>+ApplicationCacheStorage& ApplicationCacheStorage::singleton()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<ApplicationCacheStorage> storage;
</span><span class="cx"> return storage;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> DiskOrOperationFailure
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT static ApplicationCacheStorage& singleton();
+
</ins><span class="cx"> WEBCORE_EXPORT void setCacheDirectory(const String&);
</span><span class="cx"> const String& cacheDirectory() const;
</span><span class="cx">
</span><span class="lines">@@ -101,6 +103,7 @@
</span><span class="cx"> static int64_t noQuota() { return std::numeric_limits<int64_t>::max(); }
</span><span class="cx"> private:
</span><span class="cx"> ApplicationCacheStorage();
</span><ins>+
</ins><span class="cx"> PassRefPtr<ApplicationCache> loadCache(unsigned storageID);
</span><span class="cx"> ApplicationCacheGroup* loadCacheGroup(const URL& manifestURL);
</span><span class="cx">
</span><span class="lines">@@ -150,8 +153,6 @@
</span><span class="cx"> friend class WTF::NeverDestroyed<ApplicationCacheStorage>;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WEBCORE_EXPORT ApplicationCacheStorage& cacheStorage();
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ApplicationCacheStorage_h
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> page->mainFrame().editor().toggleContinuousSpellChecking();
</span><span class="cx"> if (page->mainFrame().editor().isOverwriteModeEnabled())
</span><span class="cx"> page->mainFrame().editor().toggleOverwriteModeEnabled();
</span><del>- cacheStorage().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
</del><ins>+ ApplicationCacheStorage::singleton().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> MediaSessionManager::sharedManager().resetRestrictions();
</span><span class="cx"> #endif
</span><span class="lines">@@ -1928,7 +1928,7 @@
</span><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document)
</span><span class="cx"> return;
</span><del>- cacheStorage().storeUpdatedQuotaForOrigin(document->securityOrigin(), quota);
</del><ins>+ ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin(document->securityOrigin(), quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::registerURLSchemeAsBypassingContentSecurityPolicy(const String& scheme)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-03 Chris Dumez <cdumez@apple.com>
+
+ Access ApplicationCacheStorage global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=142239
+
+ Reviewed by Anders Carlsson.
+
+ Access ApplicationCacheStorage global instance via singleton() static
+ member function as per WebKit coding style.
+
</ins><span class="cx"> 2015-03-02 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK1][WK2][Mac] Fullscreen animation is incorrect when page is scaled.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> [WebView _setCacheModel:cacheModel];
</span><span class="cx">
</span><span class="cx"> // Empty the application cache.
</span><del>- WebCore::cacheStorage().empty();
</del><ins>+ WebCore::ApplicationCacheStorage::singleton().empty();
</ins><span class="cx">
</span><span class="cx"> // Empty the Cross-Origin Preflight cache
</span><span class="cx"> WebCore::CrossOriginPreflightResultCache::singleton().empty();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebApplicationCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> SQLiteDatabaseTracker::setClient(WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());
</span><span class="cx">
</span><del>- cacheStorage().setCacheDirectory([NSString _webkit_localCacheDirectoryWithBundleIdentifier:bundleIdentifier]);
</del><ins>+ ApplicationCacheStorage::singleton().setCacheDirectory([NSString _webkit_localCacheDirectoryWithBundleIdentifier:bundleIdentifier]);
</ins><span class="cx">
</span><span class="cx"> initialized = YES;
</span><span class="cx"> }
</span><span class="lines">@@ -61,23 +61,24 @@
</span><span class="cx">
</span><span class="cx"> + (long long)maximumSize
</span><span class="cx"> {
</span><del>- return cacheStorage().maximumSize();
</del><ins>+ return ApplicationCacheStorage::singleton().maximumSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)setMaximumSize:(long long)size
</span><span class="cx"> {
</span><del>- cacheStorage().deleteAllEntries();
- cacheStorage().setMaximumSize(size);
</del><ins>+ auto& cacheStorage = ApplicationCacheStorage::singleton();
+ cacheStorage.deleteAllEntries();
+ cacheStorage.setMaximumSize(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (long long)defaultOriginQuota
</span><span class="cx"> {
</span><del>- return cacheStorage().defaultOriginQuota();
</del><ins>+ return ApplicationCacheStorage::singleton().defaultOriginQuota();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)setDefaultOriginQuota:(long long)size
</span><span class="cx"> {
</span><del>- cacheStorage().setDefaultOriginQuota(size);
</del><ins>+ ApplicationCacheStorage::singleton().setDefaultOriginQuota(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (long long)diskUsageForOrigin:(WebSecurityOrigin *)origin
</span><span class="lines">@@ -98,7 +99,7 @@
</span><span class="cx"> + (NSArray *)originsWithCache
</span><span class="cx"> {
</span><span class="cx"> HashSet<RefPtr<SecurityOrigin>> coreOrigins;
</span><del>- cacheStorage().getOriginsWithCache(coreOrigins);
</del><ins>+ ApplicationCacheStorage::singleton().getOriginsWithCache(coreOrigins);
</ins><span class="cx">
</span><span class="cx"> NSMutableArray *webOrigins = [[[NSMutableArray alloc] initWithCapacity:coreOrigins.size()] autorelease];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebApplicationCacheQuotaManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> - (unsigned long long)usage
</span><span class="cx"> {
</span><span class="cx"> long long usage;
</span><del>- if (cacheStorage().calculateUsageForOrigin([_origin _core], usage))
</del><ins>+ if (ApplicationCacheStorage::singleton().calculateUsageForOrigin([_origin _core], usage))
</ins><span class="cx"> return usage;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx"> - (unsigned long long)quota
</span><span class="cx"> {
</span><span class="cx"> long long quota;
</span><del>- if (cacheStorage().calculateQuotaForOrigin([_origin _core], quota))
</del><ins>+ if (ApplicationCacheStorage::singleton().calculateQuotaForOrigin([_origin _core], quota))
</ins><span class="cx"> return quota;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setQuota:(unsigned long long)quota
</span><span class="cx"> {
</span><del>- cacheStorage().storeUpdatedQuotaForOrigin([_origin _core], quota);
</del><ins>+ ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin([_origin _core], quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx">
</span><span class="cx"> NSString* cacheDir = [NSString _webkit_localCacheDirectoryWithBundleIdentifier:appName];
</span><span class="cx">
</span><del>- cacheStorage().setCacheDirectory(cacheDir);
</del><ins>+ ApplicationCacheStorage::singleton().setCacheDirectory(cacheDir);
</ins><span class="cx"> initialized = YES;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/win/ChangeLog 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-03 Chris Dumez <cdumez@apple.com>
+
+ Access ApplicationCacheStorage global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=142239
+
+ Reviewed by Anders Carlsson.
+
+ Access ApplicationCacheStorage global instance via singleton() static
+ member function as per WebKit coding style.
+
</ins><span class="cx"> 2015-03-01 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make NotificationCenter / Notification suspendable
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebApplicationCache.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebApplicationCache.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/win/WebApplicationCache.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -95,14 +95,15 @@
</span><span class="cx"> if (!size)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- *size = WebCore::cacheStorage().maximumSize();
</del><ins>+ *size = WebCore::ApplicationCacheStorage::singleton().maximumSize();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebApplicationCache::setMaximumSize(long long size)
</span><span class="cx"> {
</span><del>- WebCore::cacheStorage().deleteAllEntries();
- WebCore::cacheStorage().setMaximumSize(size);
</del><ins>+ auto& cacheStorage = WebCore::ApplicationCacheStorage::singleton();
+ cacheStorage.deleteAllEntries();
+ cacheStorage.setMaximumSize(size);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,13 +112,13 @@
</span><span class="cx"> if (!quota)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- *quota = WebCore::cacheStorage().defaultOriginQuota();
</del><ins>+ *quota = WebCore::ApplicationCacheStorage::singleton().defaultOriginQuota();
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT WebApplicationCache::setDefaultOriginQuota(long long quota)
</span><span class="cx"> {
</span><del>- WebCore::cacheStorage().setDefaultOriginQuota(quota);
</del><ins>+ WebCore::ApplicationCacheStorage::singleton().setDefaultOriginQuota(quota);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -160,7 +161,7 @@
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> coreOrigins;
</span><del>- WebCore::cacheStorage().getOriginsWithCache(coreOrigins);
</del><ins>+ WebCore::ApplicationCacheStorage::singleton().getOriginsWithCache(coreOrigins);
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CFMutableArrayRef> arrayItem = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, coreOrigins.size(), &MarshallingHelpers::kIUnknownArrayCallBacks));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCache.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCache.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/win/WebCache.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> memoryCache.setDisabled(false);
</span><span class="cx">
</span><span class="cx"> // Empty the application cache.
</span><del>- WebCore::cacheStorage().empty();
</del><ins>+ WebCore::ApplicationCacheStorage::singleton().empty();
</ins><span class="cx">
</span><span class="cx"> // Empty the Cross-Origin Preflight cache
</span><span class="cx"> WebCore::CrossOriginPreflightResultCache::singleton().empty();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -2702,7 +2702,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!path.isNull())
</span><del>- cacheStorage().setCacheDirectory(path);
</del><ins>+ ApplicationCacheStorage::singleton().setCacheDirectory(path);
</ins><span class="cx">
</span><span class="cx"> initialized = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-03 Chris Dumez <cdumez@apple.com>
+
+ Access ApplicationCacheStorage global instance via singleton() static member function
+ https://bugs.webkit.org/show_bug.cgi?id=142239
+
+ Reviewed by Anders Carlsson.
+
+ Access ApplicationCacheStorage global instance via singleton() static
+ member function as per WebKit coding style.
+
</ins><span class="cx"> 2015-03-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Build Fix: Add fall back handling in postprocess script for missing/unknown platform name.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0);
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- cacheStorage().setDefaultOriginQuota(25ULL * 1024 * 1024);
</del><ins>+ ApplicationCacheStorage::singleton().setDefaultOriginQuota(25ULL * 1024 * 1024);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (WebPreferences::anyPagesAreUsingPrivateBrowsing())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessApplicationCacheWebApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> {
</span><span class="cx"> HashSet<RefPtr<SecurityOrigin>> origins;
</span><span class="cx">
</span><del>- cacheStorage().getOriginsWithCache(origins);
</del><ins>+ ApplicationCacheStorage::singleton().getOriginsWithCache(origins);
</ins><span class="cx">
</span><span class="cx"> Vector<SecurityOriginData> identifiers;
</span><span class="cx"> identifiers.reserveCapacity(origins.size());
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> void WebApplicationCacheManager::setAppCacheMaximumSize(uint64_t size)
</span><span class="cx"> {
</span><del>- cacheStorage().setMaximumSize(size);
</del><ins>+ ApplicationCacheStorage::singleton().setMaximumSize(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -374,19 +374,20 @@
</span><span class="cx"> void InjectedBundle::setApplicationCacheOriginQuota(const String& originString, uint64_t bytes)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
</span><del>- cacheStorage().storeUpdatedQuotaForOrigin(origin.get(), bytes);
</del><ins>+ ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin(origin.get(), bytes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::resetApplicationCacheOriginQuota(const String& originString)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);
</span><del>- cacheStorage().storeUpdatedQuotaForOrigin(origin.get(), cacheStorage().defaultOriginQuota());
</del><ins>+ auto& cacheStorage = ApplicationCacheStorage::singleton();
+ cacheStorage.storeUpdatedQuotaForOrigin(origin.get(), cacheStorage.defaultOriginQuota());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<API::Array> InjectedBundle::originsWithApplicationCache()
</span><span class="cx"> {
</span><span class="cx"> HashSet<RefPtr<SecurityOrigin>> origins;
</span><del>- cacheStorage().getOriginsWithCache(origins);
</del><ins>+ ApplicationCacheStorage::singleton().getOriginsWithCache(origins);
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<API::Object>> originIdentifiers;
</span><span class="cx"> originIdentifiers.reserveInitialCapacity(origins.size());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -724,8 +724,9 @@
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="cx"> syncSendFlags |= IPC::SpinRunLoopWhileWaitingForReply;
</span><span class="cx">
</span><ins>+ auto& cacheStorage = ApplicationCacheStorage::singleton();
</ins><span class="cx"> int64_t currentQuota = 0;
</span><del>- if (!cacheStorage().calculateQuotaForOrigin(origin, currentQuota))
</del><ins>+ if (!cacheStorage.calculateQuotaForOrigin(origin, currentQuota))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> uint64_t newQuota = 0;
</span><span class="lines">@@ -733,7 +734,7 @@
</span><span class="cx"> Messages::WebPageProxy::ReachedApplicationCacheOriginQuota(origin->databaseIdentifier(), currentQuota, totalBytesNeeded),
</span><span class="cx"> Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::Reply(newQuota), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
</span><span class="cx">
</span><del>- cacheStorage().storeUpdatedQuotaForOrigin(origin, newQuota);
</del><ins>+ cacheStorage.storeUpdatedQuotaForOrigin(origin, newQuota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (180962 => 180963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-03-04 00:08:34 UTC (rev 180962)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-03-04 00:10:08 UTC (rev 180963)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!parameters.applicationCacheDirectory.isEmpty())
</span><del>- cacheStorage().setCacheDirectory(parameters.applicationCacheDirectory);
</del><ins>+ ApplicationCacheStorage::singleton().setCacheDirectory(parameters.applicationCacheDirectory);
</ins><span class="cx">
</span><span class="cx"> m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
</span><span class="cx"> setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
</span><span class="lines">@@ -729,7 +729,7 @@
</span><span class="cx"> void WebProcess::clearApplicationCache()
</span><span class="cx"> {
</span><span class="cx"> // Empty the application cache.
</span><del>- cacheStorage().empty();
</del><ins>+ ApplicationCacheStorage::singleton().empty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void addCaseFoldedCharacters(StringHasher& hasher, const String& string)
</span></span></pre>
</div>
</div>
</body>
</html>