<!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>[182612] trunk/Source/WebCore</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/182612">182612</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-09 16:32:49 -0700 (Thu, 09 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it possible to create an application cache storage with custom directories
https://bugs.webkit.org/show_bug.cgi?id=143588
Reviewed by Sam Weinig.
Add cache directory and flat file directory name parameters to ApplicationCacheStorage::create.
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::store):
(WebCore::ApplicationCacheStorage::loadCache):
(WebCore::ApplicationCacheStorage::checkForDeletedResources):
(WebCore::ApplicationCacheStorage::flatFileAreaSize):
(WebCore::ApplicationCacheStorage::ApplicationCacheStorage):
(WebCore::ApplicationCacheStorage::create):
(WebCore::ApplicationCacheStorage::singleton):
* loader/appcache/ApplicationCacheStorage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182611 => 182612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-09 22:57:30 UTC (rev 182611)
+++ trunk/Source/WebCore/ChangeLog 2015-04-09 23:32:49 UTC (rev 182612)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-09 Anders Carlsson <andersca@apple.com>
+
+ Make it possible to create an application cache storage with custom directories
+ https://bugs.webkit.org/show_bug.cgi?id=143588
+
+ Reviewed by Sam Weinig.
+
+ Add cache directory and flat file directory name parameters to ApplicationCacheStorage::create.
+
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::store):
+ (WebCore::ApplicationCacheStorage::loadCache):
+ (WebCore::ApplicationCacheStorage::checkForDeletedResources):
+ (WebCore::ApplicationCacheStorage::flatFileAreaSize):
+ (WebCore::ApplicationCacheStorage::ApplicationCacheStorage):
+ (WebCore::ApplicationCacheStorage::create):
+ (WebCore::ApplicationCacheStorage::singleton):
+ * loader/appcache/ApplicationCacheStorage.h:
+
</ins><span class="cx"> 2015-04-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Text-combine erroneously draws vertically after non-layout-causing style change
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (182611 => 182612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2015-04-09 22:57:30 UTC (rev 182611)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2015-04-09 23:32:49 UTC (rev 182612)
</span><span class="lines">@@ -45,8 +45,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const char flatFileSubdirectory[] = "ApplicationCache";
-
</del><span class="cx"> template <class T>
</span><span class="cx"> class StorageIDJournal {
</span><span class="cx"> public:
</span><span class="lines">@@ -828,7 +826,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, flatFileSubdirectory);
</del><ins>+ String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, m_flatFileSubdirectoryName);
</ins><span class="cx"> makeAllDirectories(flatFileDirectory);
</span><span class="cx">
</span><span class="cx"> String extension;
</span><span class="lines">@@ -1134,7 +1132,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ApplicationCache> cache = ApplicationCache::create();
</span><span class="cx">
</span><del>- String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, flatFileSubdirectory);
</del><ins>+ String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, m_flatFileSubdirectoryName);
</ins><span class="cx">
</span><span class="cx"> int result;
</span><span class="cx"> while ((result = cacheStatement.step()) == SQLITE_ROW) {
</span><span class="lines">@@ -1483,7 +1481,7 @@
</span><span class="cx"> if (path.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, flatFileSubdirectory);
</del><ins>+ String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, m_flatFileSubdirectoryName);
</ins><span class="cx"> String fullPath = pathByAppendingComponent(flatFileDirectory, path);
</span><span class="cx">
</span><span class="cx"> // Don't exit the flatFileDirectory! This should only happen if the "path" entry contains a directory
</span><span class="lines">@@ -1511,7 +1509,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> long long totalSize = 0;
</span><del>- String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, flatFileSubdirectory);
</del><ins>+ String flatFileDirectory = pathByAppendingComponent(m_cacheDirectory, m_flatFileSubdirectoryName);
</ins><span class="cx"> while (selectPaths.step() == SQLITE_ROW) {
</span><span class="cx"> String path = selectPaths.getColumnText(0);
</span><span class="cx"> String fullPath = pathByAppendingComponent(flatFileDirectory, path);
</span><span class="lines">@@ -1581,21 +1579,23 @@
</span><span class="cx"> return usage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ApplicationCacheStorage::ApplicationCacheStorage()
- : m_maximumSize(ApplicationCacheStorage::noQuota())
</del><ins>+ApplicationCacheStorage::ApplicationCacheStorage(const String& cacheDirectory, const String& flatFileSubdirectoryName)
+ : m_cacheDirectory(cacheDirectory)
+ , m_flatFileSubdirectoryName(flatFileSubdirectoryName)
+ , m_maximumSize(ApplicationCacheStorage::noQuota())
</ins><span class="cx"> , m_isMaximumSizeReached(false)
</span><span class="cx"> , m_defaultOriginQuota(ApplicationCacheStorage::noQuota())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<ApplicationCacheStorage> ApplicationCacheStorage::create()
</del><ins>+Ref<ApplicationCacheStorage> ApplicationCacheStorage::create(const String& cacheDirectory, const String& flatFileSubdirectoryName)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ApplicationCacheStorage);
</del><ins>+ return adoptRef(*new ApplicationCacheStorage(cacheDirectory, flatFileSubdirectoryName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplicationCacheStorage& ApplicationCacheStorage::singleton()
</span><span class="cx"> {
</span><del>- static ApplicationCacheStorage& storage = create().leakRef();
</del><ins>+ static ApplicationCacheStorage& storage = create(String(), "ApplicationCache").leakRef();
</ins><span class="cx"> return storage;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h (182611 => 182612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2015-04-09 22:57:30 UTC (rev 182611)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.h 2015-04-09 23:32:49 UTC (rev 182612)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> // FIXME: Migrate off of this singleton and towards a world where each page has a storage.
</span><span class="cx"> WEBCORE_EXPORT static ApplicationCacheStorage& singleton();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static Ref<ApplicationCacheStorage> create();
</del><ins>+ WEBCORE_EXPORT static Ref<ApplicationCacheStorage> create(const String& cacheDirectory, const String& flatFileSubdirectoryName);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setCacheDirectory(const String&);
</span><span class="cx"> const String& cacheDirectory() const;
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> static int64_t unknownQuota() { return -1; }
</span><span class="cx"> static int64_t noQuota() { return std::numeric_limits<int64_t>::max(); }
</span><span class="cx"> private:
</span><del>- ApplicationCacheStorage();
</del><ins>+ ApplicationCacheStorage(const String& cacheDirectory, const String& flatFileSubdirectoryName);
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<ApplicationCache> loadCache(unsigned storageID);
</span><span class="cx"> ApplicationCacheGroup* loadCacheGroup(const URL& manifestURL);
</span><span class="lines">@@ -141,9 +141,10 @@
</span><span class="cx"> void checkForMaxSizeReached();
</span><span class="cx"> void checkForDeletedResources();
</span><span class="cx"> long long flatFileAreaSize();
</span><del>-
</del><ins>+
</ins><span class="cx"> String m_cacheDirectory;
</span><span class="cx"> String m_cacheFile;
</span><ins>+ const String m_flatFileSubdirectoryName;
</ins><span class="cx">
</span><span class="cx"> int64_t m_maximumSize;
</span><span class="cx"> bool m_isMaximumSizeReached;
</span></span></pre>
</div>
</div>
</body>
</html>