<!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>[182540] trunk/Source/WebKit</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/182540">182540</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 09:10:56 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of uses of ApplicationCacheStorage::singleton() from WebKitLegacy
https://bugs.webkit.org/show_bug.cgi?id=143504
Reviewed by Sam Weinig.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Add WebApplicationCacheInternal.h.
Source/WebKit/mac:
Add a webApplicationCacheStorage() function and use it throughout WebKitLegacy.
In the future, webApplicationCacheStorage will return a custom singleton, but for now
it just returns ApplicationCacheStorage::singleton().
* Misc/WebCache.mm:
(+[WebCache empty]):
* WebCoreSupport/WebApplicationCache.mm:
(+[WebApplicationCache maximumSize]):
(+[WebApplicationCache setMaximumSize:]):
(+[WebApplicationCache defaultOriginQuota]):
(+[WebApplicationCache setDefaultOriginQuota:]):
(+[WebApplicationCache originsWithCache]):
(webApplicationCacheStorage):
* WebCoreSupport/WebApplicationCacheInternal.h: Added.
* WebCoreSupport/WebApplicationCacheQuotaManager.mm:
(-[WebApplicationCacheQuotaManager usage]):
(-[WebApplicationCacheQuotaManager quota]):
(-[WebApplicationCacheQuotaManager setQuota:]):
* WebView/WebView.mm:
(WebKitInitializeApplicationCachePathIfNecessary):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebApplicationCacheInternalh">trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (182539 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-04-08 15:59:06 UTC (rev 182539)
+++ trunk/Source/WebKit/ChangeLog 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-07 Anders Carlsson <andersca@apple.com>
+
+ Get rid of uses of ApplicationCacheStorage::singleton() from WebKitLegacy
+ https://bugs.webkit.org/show_bug.cgi?id=143504
+
+ Reviewed by Sam Weinig.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ Add WebApplicationCacheInternal.h.
+
</ins><span class="cx"> 2015-04-05 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use constants of sqlite3 directly for status of SQL result in webdatabase
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (182539 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2015-04-08 15:59:06 UTC (rev 182539)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> 1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
</span><span class="cx"> 1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
</span><span class="cx"> 1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */; };
</span><ins>+ 1A86CCD41AD48A620074BA89 /* WebApplicationCacheInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */; };
</ins><span class="cx"> 1A8DED500EE88B8A00F25022 /* HostedNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */; };
</span><span class="cx"> 1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */; };
</span><span class="cx"> 1AA83F831A5C4AE400026EC6 /* WebDatabaseProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA83F811A5C4AE400026EC6 /* WebDatabaseProvider.cpp */; };
</span><span class="lines">@@ -517,6 +518,7 @@
</span><span class="cx"> 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
</span><span class="cx"> 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginRequest.m; sourceTree = "<group>"; };
</span><ins>+ 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostedNetscapePluginStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HostedNetscapePluginStream.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AA83F811A5C4AE400026EC6 /* WebDatabaseProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebDatabaseProvider.cpp; path = ../../Storage/WebDatabaseProvider.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1587,6 +1589,7 @@
</span><span class="cx"> CEDA12D9152CBE6800D9E08D /* WebAlternativeTextClient.mm */,
</span><span class="cx"> B68049710FFBCEC1009F7F62 /* WebApplicationCache.h */,
</span><span class="cx"> B68049720FFBCEC1009F7F62 /* WebApplicationCache.mm */,
</span><ins>+ 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */,
</ins><span class="cx"> A5DEFC1111D5344B00885273 /* WebApplicationCacheQuotaManager.h */,
</span><span class="cx"> A5DEFC1211D5344B00885273 /* WebApplicationCacheQuotaManager.mm */,
</span><span class="cx"> 51CBFCAC0D10E6C5002DBF51 /* WebCachedFramePlatformData.h */,
</span><span class="lines">@@ -1933,6 +1936,7 @@
</span><span class="cx"> 939810A50824BF01008DF038 /* WebPDFRepresentation.h in Headers */,
</span><span class="cx"> 939810A40824BF01008DF038 /* WebPDFView.h in Headers */,
</span><span class="cx"> 1AA879B611CBE9BF003C664F /* WebPlatformStrategies.h in Headers */,
</span><ins>+ 1A86CCD41AD48A620074BA89 /* WebApplicationCacheInternal.h in Headers */,
</ins><span class="cx"> 939810350824BF01008DF038 /* WebPlugin.h in Headers */,
</span><span class="cx"> 939810360824BF01008DF038 /* WebPluginContainer.h in Headers */,
</span><span class="cx"> A10C1D801820303D0036883A /* WebMailDelegate.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182539 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-08 15:59:06 UTC (rev 182539)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-04-07 Anders Carlsson <andersca@apple.com>
+
+ Get rid of uses of ApplicationCacheStorage::singleton() from WebKitLegacy
+ https://bugs.webkit.org/show_bug.cgi?id=143504
+
+ Reviewed by Sam Weinig.
+
+ Add a webApplicationCacheStorage() function and use it throughout WebKitLegacy.
+ In the future, webApplicationCacheStorage will return a custom singleton, but for now
+ it just returns ApplicationCacheStorage::singleton().
+
+ * Misc/WebCache.mm:
+ (+[WebCache empty]):
+ * WebCoreSupport/WebApplicationCache.mm:
+ (+[WebApplicationCache maximumSize]):
+ (+[WebApplicationCache setMaximumSize:]):
+ (+[WebApplicationCache defaultOriginQuota]):
+ (+[WebApplicationCache setDefaultOriginQuota:]):
+ (+[WebApplicationCache originsWithCache]):
+ (webApplicationCacheStorage):
+ * WebCoreSupport/WebApplicationCacheInternal.h: Added.
+ * WebCoreSupport/WebApplicationCacheQuotaManager.mm:
+ (-[WebApplicationCacheQuotaManager usage]):
+ (-[WebApplicationCacheQuotaManager quota]):
+ (-[WebApplicationCacheQuotaManager setQuota:]):
+ * WebView/WebView.mm:
+ (WebKitInitializeApplicationCachePathIfNecessary):
+
</ins><span class="cx"> 2015-04-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> ContextMenuItem refactoring
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (182539 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2015-04-08 15:59:06 UTC (rev 182539)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebCache.h"
</span><span class="cx">
</span><ins>+#import "WebApplicationCacheInternal.h"
</ins><span class="cx"> #import "WebNSObjectExtras.h"
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="cx"> #import "WebSystemInterface.h"
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx"> [WebView _setCacheModel:cacheModel];
</span><span class="cx">
</span><span class="cx"> // Empty the application cache.
</span><del>- WebCore::ApplicationCacheStorage::singleton().empty();
</del><ins>+ webApplicationCacheStorage().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 (182539 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2015-04-08 15:59:06 UTC (rev 182539)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "WebApplicationCache.h"
</del><ins>+#import "WebApplicationCacheInternal.h"
</ins><span class="cx">
</span><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="cx"> #import <WebCore/ApplicationCache.h>
</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>- ApplicationCacheStorage::singleton().setCacheDirectory([NSString _webkit_localCacheDirectoryWithBundleIdentifier:bundleIdentifier]);
</del><ins>+ webApplicationCacheStorage().setCacheDirectory([NSString _webkit_localCacheDirectoryWithBundleIdentifier:bundleIdentifier]);
</ins><span class="cx">
</span><span class="cx"> initialized = YES;
</span><span class="cx"> }
</span><span class="lines">@@ -61,24 +61,23 @@
</span><span class="cx">
</span><span class="cx"> + (long long)maximumSize
</span><span class="cx"> {
</span><del>- return ApplicationCacheStorage::singleton().maximumSize();
</del><ins>+ return webApplicationCacheStorage().maximumSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)setMaximumSize:(long long)size
</span><span class="cx"> {
</span><del>- auto& cacheStorage = ApplicationCacheStorage::singleton();
- cacheStorage.deleteAllEntries();
- cacheStorage.setMaximumSize(size);
</del><ins>+ webApplicationCacheStorage().deleteAllEntries();
+ webApplicationCacheStorage().setMaximumSize(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (long long)defaultOriginQuota
</span><span class="cx"> {
</span><del>- return ApplicationCacheStorage::singleton().defaultOriginQuota();
</del><ins>+ return webApplicationCacheStorage().defaultOriginQuota();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)setDefaultOriginQuota:(long long)size
</span><span class="cx"> {
</span><del>- ApplicationCacheStorage::singleton().setDefaultOriginQuota(size);
</del><ins>+ webApplicationCacheStorage().setDefaultOriginQuota(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (long long)diskUsageForOrigin:(WebSecurityOrigin *)origin
</span><span class="lines">@@ -99,7 +98,7 @@
</span><span class="cx"> + (NSArray *)originsWithCache
</span><span class="cx"> {
</span><span class="cx"> HashSet<RefPtr<SecurityOrigin>> coreOrigins;
</span><del>- ApplicationCacheStorage::singleton().getOriginsWithCache(coreOrigins);
</del><ins>+ webApplicationCacheStorage().getOriginsWithCache(coreOrigins);
</ins><span class="cx">
</span><span class="cx"> NSMutableArray *webOrigins = [[[NSMutableArray alloc] initWithCapacity:coreOrigins.size()] autorelease];
</span><span class="cx">
</span><span class="lines">@@ -113,3 +112,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+WebCore::ApplicationCacheStorage& webApplicationCacheStorage()
+{
+ return ApplicationCacheStorage::singleton();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebApplicationCacheInternalhfromrev182497trunkSourceWebKitmacWebCoreSupportWebApplicationCacheQuotaManagermm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheInternal.h (from rev 182497, trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm) (0 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheInternal.h (rev 0)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheInternal.h 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#import "WebApplicationCache.h"
+
+namespace WebCore {
+class ApplicationCacheStorage;
+}
+
+WebCore::ApplicationCacheStorage& webApplicationCacheStorage();
+
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebApplicationCacheQuotaManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm (182539 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm 2015-04-08 15:59:06 UTC (rev 182539)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebApplicationCacheQuotaManager.h"
</span><span class="cx">
</span><ins>+#import "WebApplicationCacheInternal.h"
</ins><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="cx"> #import <WebCore/ApplicationCacheStorage.h>
</span><span class="cx">
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> - (unsigned long long)usage
</span><span class="cx"> {
</span><span class="cx"> long long usage;
</span><del>- if (ApplicationCacheStorage::singleton().calculateUsageForOrigin([_origin _core], usage))
</del><ins>+ if (webApplicationCacheStorage().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 +59,14 @@
</span><span class="cx"> - (unsigned long long)quota
</span><span class="cx"> {
</span><span class="cx"> long long quota;
</span><del>- if (ApplicationCacheStorage::singleton().calculateQuotaForOrigin([_origin _core], quota))
</del><ins>+ if (webApplicationCacheStorage().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>- ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin([_origin _core], quota);
</del><ins>+ webApplicationCacheStorage().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 (182539 => 182540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-04-08 15:59:06 UTC (rev 182539)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-04-08 16:10:56 UTC (rev 182540)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #import "DictionaryPopupInfo.h"
</span><span class="cx"> #import "StorageThread.h"
</span><span class="cx"> #import "WebAlternativeTextClient.h"
</span><del>-#import "WebApplicationCache.h"
</del><ins>+#import "WebApplicationCacheInternal.h"
</ins><span class="cx"> #import "WebBackForwardListInternal.h"
</span><span class="cx"> #import "WebBaseNetscapePluginView.h"
</span><span class="cx"> #import "WebCache.h"
</span><span class="lines">@@ -744,7 +744,7 @@
</span><span class="cx">
</span><span class="cx"> NSString* cacheDir = [NSString _webkit_localCacheDirectoryWithBundleIdentifier:appName];
</span><span class="cx">
</span><del>- ApplicationCacheStorage::singleton().setCacheDirectory(cacheDir);
</del><ins>+ webApplicationCacheStorage().setCacheDirectory(cacheDir);
</ins><span class="cx"> initialized = YES;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>