<!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>[183263] 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/183263">183263</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-04-24 07:39:05 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network Cache: Make path functions members
https://bugs.webkit.org/show_bug.cgi?id=144146
Reviewed by Carlos Garcia Campos.
This simplifies the code.
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::partitionPathForKey):
(WebKit::NetworkCache::Storage::recordPathForKey):
(WebKit::NetworkCache::Storage::bodyPathForKey):
(WebKit::NetworkCache::Storage::storeBodyAsBlob):
(WebKit::NetworkCache::Storage::remove):
(WebKit::NetworkCache::Storage::dispatchReadOperation):
(WebKit::NetworkCache::Storage::finishReadOperation):
(WebKit::NetworkCache::Storage::dispatchWriteOperation):
(WebKit::NetworkCache::partitionPathForKey): Deleted.
(WebKit::NetworkCache::recordPathForKey): Deleted.
(WebKit::NetworkCache::bodyPathForKey): Deleted.
* NetworkProcess/cache/NetworkCacheStorage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183262 => 183263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-24 11:42:43 UTC (rev 183262)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-24 14:39:05 UTC (rev 183263)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-04-24 Antti Koivisto <antti@apple.com>
+
+ Network Cache: Make path functions members
+ https://bugs.webkit.org/show_bug.cgi?id=144146
+
+ Reviewed by Carlos Garcia Campos.
+
+ This simplifies the code.
+
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::partitionPathForKey):
+ (WebKit::NetworkCache::Storage::recordPathForKey):
+ (WebKit::NetworkCache::Storage::bodyPathForKey):
+ (WebKit::NetworkCache::Storage::storeBodyAsBlob):
+ (WebKit::NetworkCache::Storage::remove):
+ (WebKit::NetworkCache::Storage::dispatchReadOperation):
+ (WebKit::NetworkCache::Storage::finishReadOperation):
+ (WebKit::NetworkCache::Storage::dispatchWriteOperation):
+ (WebKit::NetworkCache::partitionPathForKey): Deleted.
+ (WebKit::NetworkCache::recordPathForKey): Deleted.
+ (WebKit::NetworkCache::bodyPathForKey): Deleted.
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2015-04-24 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Remove incorrect assert after r183189.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (183262 => 183263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-04-24 11:42:43 UTC (rev 183262)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-04-24 14:39:05 UTC (rev 183263)
</span><span class="lines">@@ -192,10 +192,10 @@
</span><span class="cx"> return !m_recordFilter || m_recordFilter->mayContain(key.hash());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String partitionPathForKey(const Key& key, const String& cachePath)
</del><ins>+String Storage::partitionPathForKey(const Key& key) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!key.partition().isEmpty());
</span><del>- return WebCore::pathByAppendingComponent(cachePath, key.partition());
</del><ins>+ return WebCore::pathByAppendingComponent(recordsPath(), key.partition());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String fileNameForKey(const Key& key)
</span><span class="lines">@@ -203,9 +203,9 @@
</span><span class="cx"> return key.hashAsString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String recordPathForKey(const Key& key, const String& cachePath)
</del><ins>+String Storage::recordPathForKey(const Key& key) const
</ins><span class="cx"> {
</span><del>- return WebCore::pathByAppendingComponent(partitionPathForKey(key, cachePath), fileNameForKey(key));
</del><ins>+ return WebCore::pathByAppendingComponent(partitionPathForKey(key), fileNameForKey(key));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String bodyPathForRecordPath(const String& recordPath)
</span><span class="lines">@@ -213,9 +213,9 @@
</span><span class="cx"> return recordPath + bodyPostfix;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String bodyPathForKey(const Key& key, const String& cachePath)
</del><ins>+String Storage::bodyPathForKey(const Key& key) const
</ins><span class="cx"> {
</span><del>- return bodyPathForRecordPath(recordPathForKey(key, cachePath));
</del><ins>+ return bodyPathForRecordPath(recordPathForKey(key));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static unsigned hashData(const Data& data)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">
</span><span class="cx"> Optional<BlobStorage::Blob> Storage::storeBodyAsBlob(const Record& record, const MappedBodyHandler& mappedBodyHandler)
</span><span class="cx"> {
</span><del>- auto bodyPath = bodyPathForKey(record.key, recordsPath());
</del><ins>+ auto bodyPath = bodyPathForKey(record.key);
</ins><span class="cx">
</span><span class="cx"> // Store the body.
</span><span class="cx"> auto blob = m_blobStorage.add(bodyPath, record.body);
</span><span class="lines">@@ -404,9 +404,8 @@
</span><span class="cx"> // The next synchronization will update everything.
</span><span class="cx">
</span><span class="cx"> serialBackgroundIOQueue().dispatch([this, key] {
</span><del>- auto recordsPath = this->recordsPath();
- WebCore::deleteFile(recordPathForKey(key, recordsPath));
- m_blobStorage.remove(bodyPathForKey(key, recordsPath));
</del><ins>+ WebCore::deleteFile(recordPathForKey(key));
+ m_blobStorage.remove(bodyPathForKey(key));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -423,7 +422,7 @@
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> ASSERT(m_activeReadOperations.contains(&readOperation));
</span><span class="cx">
</span><del>- auto recordPath = recordPathForKey(readOperation.key, recordsPath());
</del><ins>+ auto recordPath = recordPathForKey(readOperation.key);
</ins><span class="cx">
</span><span class="cx"> RefPtr<IOChannel> channel = IOChannel::open(recordPath, IOChannel::Type::Read);
</span><span class="cx"> channel->read(0, std::numeric_limits<size_t>::max(), &ioQueue(), [this, &readOperation](const Data& fileData, int error) {
</span><span class="lines">@@ -440,7 +439,7 @@
</span><span class="cx">
</span><span class="cx"> // Read the body blob in parallel with the record read.
</span><span class="cx"> ioQueue().dispatch([this, &readOperation] {
</span><del>- auto bodyPath = bodyPathForKey(readOperation.key, this->recordsPath());
</del><ins>+ auto bodyPath = bodyPathForKey(readOperation.key);
</ins><span class="cx"> readOperation.resultBodyBlob = m_blobStorage.get(bodyPath);
</span><span class="cx"> finishReadOperation(readOperation);
</span><span class="cx"> });
</span><span class="lines">@@ -463,7 +462,7 @@
</span><span class="cx">
</span><span class="cx"> bool success = readOperation.completionHandler(WTF::move(readOperation.resultRecord));
</span><span class="cx"> if (success)
</span><del>- updateFileModificationTime(recordPathForKey(readOperation.key, recordsPath()));
</del><ins>+ updateFileModificationTime(recordPathForKey(readOperation.key));
</ins><span class="cx"> else
</span><span class="cx"> remove(readOperation.key);
</span><span class="cx"> ASSERT(m_activeReadOperations.contains(&readOperation));
</span><span class="lines">@@ -544,9 +543,8 @@
</span><span class="cx"> addToRecordFilter(writeOperation.record.key);
</span><span class="cx">
</span><span class="cx"> backgroundIOQueue().dispatch([this, &writeOperation] {
</span><del>- auto recordsPath = this->recordsPath();
- auto partitionPath = partitionPathForKey(writeOperation.record.key, recordsPath);
- auto recordPath = recordPathForKey(writeOperation.record.key, recordsPath);
</del><ins>+ auto partitionPath = partitionPathForKey(writeOperation.record.key);
+ auto recordPath = recordPathForKey(writeOperation.record.key);
</ins><span class="cx">
</span><span class="cx"> WebCore::makeAllDirectories(partitionPath);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (183262 => 183263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-04-24 11:42:43 UTC (rev 183262)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-04-24 14:39:05 UTC (rev 183263)
</span><span class="lines">@@ -90,6 +90,10 @@
</span><span class="cx"> private:
</span><span class="cx"> Storage(const String& directoryPath);
</span><span class="cx">
</span><ins>+ String partitionPathForKey(const Key&) const;
+ String recordPathForKey(const Key&) const;
+ String bodyPathForKey(const Key&) const;
+
</ins><span class="cx"> void synchronize();
</span><span class="cx"> void deleteOldVersions();
</span><span class="cx"> void shrinkIfNeeded();
</span></span></pre>
</div>
</div>
</body>
</html>