<!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>[184686] 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/184686">184686</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 18:30:18 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKWebsiteDataStore API doesn't report webkit.org as using Databases or App Cache after visiting http://www.webkit.org/demos/sticky-notes/
https://bugs.webkit.org/show_bug.cgi?id=145238
rdar://problem/20581175
Reviewed by Tim Horton.
Make sure to set the application cache and WebSQL directories when using the legacy data store.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory):
(WebKit::WebProcessPool::platformDefaultApplicationCacheDirectory):
Rename this and move it to the right place.
* UIProcess/WebProcessPool.cpp:
(WebKit::legacyWebsiteDataStoreConfiguration):
Rename this and add the application cache and WebSQL directories.
(WebKit::WebProcessPool::WebProcessPool):
Call legacyWebsiteDataStoreConfiguration.
(WebKit::WebProcessPool::applicationCacheDirectory):
Call legacyPlatformDefaultApplicationCacheDirectory.
* UIProcess/WebProcessPool.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184685 => 184686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-21 01:28:31 UTC (rev 184685)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-21 01:30:18 UTC (rev 184686)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-05-20 Anders Carlsson <andersca@apple.com>
+
+ WKWebsiteDataStore API doesn't report webkit.org as using Databases or App Cache after visiting http://www.webkit.org/demos/sticky-notes/
+ https://bugs.webkit.org/show_bug.cgi?id=145238
+ rdar://problem/20581175
+
+ Reviewed by Tim Horton.
+
+ Make sure to set the application cache and WebSQL directories when using the legacy data store.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory):
+ (WebKit::WebProcessPool::platformDefaultApplicationCacheDirectory):
+ Rename this and move it to the right place.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::legacyWebsiteDataStoreConfiguration):
+ Rename this and add the application cache and WebSQL directories.
+
+ (WebKit::WebProcessPool::WebProcessPool):
+ Call legacyWebsiteDataStoreConfiguration.
+
+ (WebKit::WebProcessPool::applicationCacheDirectory):
+ Call legacyPlatformDefaultApplicationCacheDirectory.
+
+ * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2015-05-20 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Using CSS viewport units causes incorrect layout.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (184685 => 184686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-05-21 01:28:31 UTC (rev 184685)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-05-21 01:30:18 UTC (rev 184686)
</span><span class="lines">@@ -147,35 +147,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebProcessPool::platformDefaultApplicationCacheDirectory() const
-{
- NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
- if (!appName)
- appName = [[NSProcessInfo processInfo] processName];
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>- // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
- // Preserving it avoids the need to migrate data when upgrading.
- if (applicationIsMobileSafari() || applicationIsWebApp())
- appName = @"com.apple.WebAppCache";
-#endif
-
- ASSERT(appName);
-
-#if PLATFORM(IOS)
- NSString *cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
-#else
- char cacheDirectory[MAXPATHLEN];
- size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
- if (!cacheDirectoryLen)
- return String();
-
- NSString *cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
-#endif
- NSString* cachePath = [cacheDir stringByAppendingPathComponent:appName];
- return stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
-}
-
-#if PLATFORM(IOS)
</del><span class="cx"> String WebProcessPool::cookieStorageDirectory() const
</span><span class="cx"> {
</span><span class="cx"> String path = pathForProcessContainer();
</span><span class="lines">@@ -392,7 +364,34 @@
</span><span class="cx"> return stringByResolvingSymlinksInPath([mediaKeysStorageDirectory stringByStandardizingPath]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory()
+{
+ NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
+ if (!appName)
+ appName = [[NSProcessInfo processInfo] processName];
+#if PLATFORM(IOS)
+ // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
+ // Preserving it avoids the need to migrate data when upgrading.
+ if (applicationIsMobileSafari() || applicationIsWebApp())
+ appName = @"com.apple.WebAppCache";
+#endif
</ins><span class="cx">
</span><ins>+ ASSERT(appName);
+
+#if PLATFORM(IOS)
+ NSString *cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"];
+#else
+ char cacheDirectory[MAXPATHLEN];
+ size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN);
+ if (!cacheDirectoryLen)
+ return String();
+
+ NSString *cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1];
+#endif
+ NSString* cachePath = [cacheDir stringByAppendingPathComponent:appName];
+ return stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
+}
+
</ins><span class="cx"> String WebProcessPool::platformDefaultIconDatabasePath() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: <rdar://problem/9138817> - After this "backwards compatibility" radar is removed, this code should be removed to only return an empty String.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (184685 => 184686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-05-21 01:28:31 UTC (rev 184685)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-05-21 01:30:18 UTC (rev 184686)
</span><span class="lines">@@ -130,11 +130,13 @@
</span><span class="cx"> return processPools();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static WebsiteDataStore::Configuration websiteDataStoreConfiguration(API::ProcessPoolConfiguration& processPoolConfiguration)
</del><ins>+static WebsiteDataStore::Configuration legacyWebsiteDataStoreConfiguration(API::ProcessPoolConfiguration& processPoolConfiguration)
</ins><span class="cx"> {
</span><span class="cx"> WebsiteDataStore::Configuration configuration;
</span><span class="cx">
</span><span class="cx"> configuration.localStorageDirectory = processPoolConfiguration.localStorageDirectory();
</span><ins>+ configuration.webSQLDatabaseDirectory = processPoolConfiguration.webSQLDatabaseDirectory();
+ configuration.applicationCacheDirectory = WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
</ins><span class="cx">
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="lines">@@ -158,7 +160,7 @@
</span><span class="cx"> , m_diskCacheSizeOverride(m_configuration->diskCacheSizeOverride())
</span><span class="cx"> , m_memorySamplerEnabled(false)
</span><span class="cx"> , m_memorySamplerInterval(1400.0)
</span><del>- , m_websiteDataStore(m_configuration->shouldHaveLegacyDataStore() ? API::WebsiteDataStore::create(websiteDataStoreConfiguration(m_configuration)) : nullptr)
</del><ins>+ , m_websiteDataStore(m_configuration->shouldHaveLegacyDataStore() ? API::WebsiteDataStore::create(legacyWebsiteDataStoreConfiguration(m_configuration)) : nullptr)
</ins><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
</span><span class="cx"> #endif
</span><span class="lines">@@ -1170,7 +1172,7 @@
</span><span class="cx"> if (!m_overrideApplicationCacheDirectory.isEmpty())
</span><span class="cx"> return m_overrideApplicationCacheDirectory;
</span><span class="cx">
</span><del>- return platformDefaultApplicationCacheDirectory();
</del><ins>+ return legacyPlatformDefaultApplicationCacheDirectory();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::setIconDatabasePath(const String& path)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (184685 => 184686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-05-21 01:28:31 UTC (rev 184685)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-05-21 01:30:18 UTC (rev 184686)
</span><span class="lines">@@ -364,6 +364,7 @@
</span><span class="cx"> static String legacyPlatformDefaultIndexedDBDatabaseDirectory();
</span><span class="cx"> static String legacyPlatformDefaultWebSQLDatabaseDirectory();
</span><span class="cx"> static String legacyPlatformDefaultMediaKeysStorageDirectory();
</span><ins>+ static String legacyPlatformDefaultApplicationCacheDirectory();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void platformInitialize();
</span><span class="lines">@@ -394,7 +395,6 @@
</span><span class="cx"> void languageChanged();
</span><span class="cx">
</span><span class="cx"> String applicationCacheDirectory() const;
</span><del>- String platformDefaultApplicationCacheDirectory() const;
</del><span class="cx">
</span><span class="cx"> String platformDefaultIconDatabasePath() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>