<!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>[199829] trunk/Source/WebKit/mac</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/199829">199829</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-04-21 13:05:56 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using ApplicationCacheStorage::singleton() in WebKitLegacy
https://bugs.webkit.org/show_bug.cgi?id=156859
Reviewed by Tim Horton.
* WebCoreSupport/WebApplicationCache.mm:
(+[WebApplicationCache initializeWithBundleIdentifier:]):
Change this to just store the bundle identifier.
(applicationCacheBundleIdentifier):
Helper function that returns the bundle identifier for the app cache.
(applicationCachePath):
Return the application cache path.
(webApplicationCacheStorage):
Create a new ApplicationCacheStorage object.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
Set pageConfiguration.applicationCacheStorage to webApplicationCacheStorage().
(WebKitInitializeApplicationCachePathIfNecessary): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebApplicationCachemm">trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (199828 => 199829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-04-21 19:37:30 UTC (rev 199828)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-21 20:05:56 UTC (rev 199829)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-04-21 Anders Carlsson <andersca@apple.com>
+
+ Stop using ApplicationCacheStorage::singleton() in WebKitLegacy
+ https://bugs.webkit.org/show_bug.cgi?id=156859
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebApplicationCache.mm:
+ (+[WebApplicationCache initializeWithBundleIdentifier:]):
+ Change this to just store the bundle identifier.
+
+ (applicationCacheBundleIdentifier):
+ Helper function that returns the bundle identifier for the app cache.
+
+ (applicationCachePath):
+ Return the application cache path.
+
+ (webApplicationCacheStorage):
+ Create a new ApplicationCacheStorage object.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ Set pageConfiguration.applicationCacheStorage to webApplicationCacheStorage().
+
+ (WebKitInitializeApplicationCachePathIfNecessary): Deleted.
+
</ins><span class="cx"> 2016-04-21 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> showCandidates() should take a range and the string should be the whole
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebApplicationCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm (199828 => 199829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2016-04-21 19:37:30 UTC (rev 199828)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.mm 2016-04-21 20:05:56 UTC (rev 199829)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebApplicationCacheInternal.h"
</span><span class="cx">
</span><ins>+#import "WebKitNSStringExtras.h"
</ins><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="cx"> #import <WebCore/ApplicationCache.h>
</span><span class="cx"> #import <WebCore/ApplicationCacheStorage.h>
</span><span class="lines">@@ -32,8 +33,8 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import "WebKitNSStringExtras.h"
</del><span class="cx"> #import "WebSQLiteDatabaseTrackerClient.h"
</span><ins>+#import <WebCore/RuntimeApplicationChecks.h>
</ins><span class="cx"> #import <WebCore/SQLiteDatabaseTracker.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -42,6 +43,8 @@
</span><span class="cx"> @implementation WebApplicationCache
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+static NSString *overrideBundleIdentifier;
+
</ins><span class="cx"> // FIXME: This will be removed when WebKitInitializeApplicationCachePathIfNecessary()
</span><span class="cx"> // is moved from WebView.mm to WebKitInitializeApplicationCacheIfNecessary() in this file.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=57567
</span><span class="lines">@@ -50,15 +53,38 @@
</span><span class="cx"> static BOOL initialized = NO;
</span><span class="cx"> if (initialized)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> SQLiteDatabaseTracker::setClient(WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());
</span><span class="cx">
</span><del>- webApplicationCacheStorage().setCacheDirectory([NSString _webkit_localCacheDirectoryWithBundleIdentifier:bundleIdentifier]);
-
</del><ins>+ ASSERT(!overrideBundleIdentifier);
+ overrideBundleIdentifier = [bundleIdentifier copy];
+
</ins><span class="cx"> initialized = YES;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static NSString *applicationCacheBundleIdentifier()
+{
+#if PLATFORM(IOS)
+ if (overrideBundleIdentifier)
+ return overrideBundleIdentifier;
+ if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp())
+ return @"com.apple.WebAppCache";
+#endif
+
+ NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
+ if (!appName)
+ appName = [[NSProcessInfo processInfo] processName];
+
+ ASSERT(appName);
+ return appName;
+}
+
+static NSString *applicationCachePath()
+{
+ return [NSString _webkit_localCacheDirectoryWithBundleIdentifier:applicationCacheBundleIdentifier()];
+}
+
</ins><span class="cx"> + (long long)maximumSize
</span><span class="cx"> {
</span><span class="cx"> return webApplicationCacheStorage().maximumSize();
</span><span class="lines">@@ -115,5 +141,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::ApplicationCacheStorage& webApplicationCacheStorage()
</span><span class="cx"> {
</span><del>- return ApplicationCacheStorage::singleton();
</del><ins>+ static ApplicationCacheStorage& storage = ApplicationCacheStorage::create(applicationCachePath(), "ApplicationCache").leakRef();
+
+ return storage;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (199828 => 199829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-04-21 19:37:30 UTC (rev 199828)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-04-21 20:05:56 UTC (rev 199829)
</span><span class="lines">@@ -730,29 +730,6 @@
</span><span class="cx"> reportException(execState, toJS(execState, exception));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void WebKitInitializeApplicationCachePathIfNecessary()
-{
- static BOOL initialized = NO;
- if (initialized)
- return;
-
- NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
- if (!appName)
- appName = [[NSProcessInfo processInfo] processName];
-#if PLATFORM(IOS)
- if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp())
- appName = @"com.apple.WebAppCache";
-#endif
-
- ASSERT(appName);
-
- NSString* cacheDir = [NSString _webkit_localCacheDirectoryWithBundleIdentifier:appName];
-
- webApplicationCacheStorage().setCacheDirectory(cacheDir);
-
- initialized = YES;
-}
-
</del><span class="cx"> static void WebKitInitializeApplicationStatisticsStoragePathIfNecessary()
</span><span class="cx"> {
</span><span class="cx"> static BOOL initialized = NO;
</span><span class="lines">@@ -962,7 +939,6 @@
</span><span class="cx"> if ([standardPreferences storageTrackerEnabled])
</span><span class="cx"> #endif
</span><span class="cx"> WebKitInitializeStorageIfNecessary();
</span><del>- WebKitInitializeApplicationCachePathIfNecessary();
</del><span class="cx"> WebKitInitializeApplicationStatisticsStoragePathIfNecessary();
</span><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> WebKitInitializeGamepadProviderIfNecessary();
</span><span class="lines">@@ -1002,6 +978,7 @@
</span><span class="cx"> pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
</span><ins>+ pageConfiguration.applicationCacheStorage = &webApplicationCacheStorage();
</ins><span class="cx"> pageConfiguration.databaseProvider = &WebDatabaseProvider::singleton();
</span><span class="cx"> pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
</span><span class="cx"> pageConfiguration.userContentProvider = &_private->group->userContentController();
</span><span class="lines">@@ -1245,6 +1222,7 @@
</span><span class="cx"> pageConfiguration.inspectorClient = new WebInspectorClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
</span><ins>+ pageConfiguration.applicationCacheStorage = &webApplicationCacheStorage();
</ins><span class="cx"> pageConfiguration.databaseProvider = &WebDatabaseProvider::singleton();
</span><span class="cx"> pageConfiguration.storageNamespaceProvider = &_private->group->storageNamespaceProvider();
</span><span class="cx"> pageConfiguration.userContentProvider = &_private->group->userContentController();
</span></span></pre>
</div>
</div>
</body>
</html>