<!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>[179703] 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/179703">179703</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-05 13:46:11 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use deleteFile() in NetworkCacheStorageCocoa.mm
https://bugs.webkit.org/show_bug.cgi?id=141299
Reviewed by Antti Koivisto.
Use deleteFile() in NetworkCacheStorageCocoa.mm to simplify the code
a bit.
* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
(WebKit::NetworkCacheStorage::removeEntry):
(WebKit::NetworkCacheStorage::clear):
(WebKit::NetworkCacheStorage::shrinkIfNeeded):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179702 => 179703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-05 21:29:19 UTC (rev 179702)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-05 21:46:11 UTC (rev 179703)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-05 Chris Dumez <cdumez@apple.com>
+
+ Use deleteFile() in NetworkCacheStorageCocoa.mm
+ https://bugs.webkit.org/show_bug.cgi?id=141299
+
+ Reviewed by Antti Koivisto.
+
+ Use deleteFile() in NetworkCacheStorageCocoa.mm to simplify the code
+ a bit.
+
+ * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+ (WebKit::NetworkCacheStorage::removeEntry):
+ (WebKit::NetworkCacheStorage::clear):
+ (WebKit::NetworkCacheStorage::shrinkIfNeeded):
+
</ins><span class="cx"> 2015-02-04 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid copying std::functions across threads in NetworkCacheStorage
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (179702 => 179703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-02-05 21:29:19 UTC (rev 179702)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-02-05 21:46:11 UTC (rev 179703)
</span><span class="lines">@@ -345,8 +345,7 @@
</span><span class="cx">
</span><span class="cx"> StringCapture filePathCapture(filePathForKey(key, m_directoryPath));
</span><span class="cx"> dispatch_async(m_ioQueue.get(), [this, filePathCapture] {
</span><del>- CString path = WebCore::fileSystemRepresentation(filePathCapture.string());
- unlink(path.data());
</del><ins>+ WebCore::deleteFile(filePathCapture.string());
</ins><span class="cx"> if (m_approximateEntryCount)
</span><span class="cx"> --m_approximateEntryCount;
</span><span class="cx"> });
</span><span class="lines">@@ -550,8 +549,7 @@
</span><span class="cx"> traverseDirectory(directoryPath, DT_DIR, [&directoryPath](const String& subdirName) {
</span><span class="cx"> String subdirPath = WebCore::pathByAppendingComponent(directoryPath, subdirName);
</span><span class="cx"> traverseDirectory(subdirPath, DT_REG, [&subdirPath](const String& fileName) {
</span><del>- String filePath = WebCore::pathByAppendingComponent(subdirPath, fileName);
- unlink(WebCore::fileSystemRepresentation(filePath).data());
</del><ins>+ WebCore::deleteFile(WebCore::pathByAppendingComponent(subdirPath, fileName));
</ins><span class="cx"> });
</span><span class="cx"> rmdir(WebCore::fileSystemRepresentation(subdirPath).data());
</span><span class="cx"> });
</span><span class="lines">@@ -578,15 +576,13 @@
</span><span class="cx"> String cachePath = cachePathCapture.string();
</span><span class="cx"> size_t foundEntryCount = 0;
</span><span class="cx"> size_t deletedCount = 0;
</span><del>- traverseCacheFiles(cachePath, [this, &foundEntryCount, &deletedCount](const String& fileName, const String& directory) {
- String partitionPath = WebCore::pathByAppendingComponent(directory, fileName);
- CString path = WebCore::fileSystemRepresentation(partitionPath);
</del><ins>+ traverseCacheFiles(cachePath, [this, &foundEntryCount, &deletedCount](const String& fileName, const String& partitionPath) {
</ins><span class="cx"> ++foundEntryCount;
</span><span class="cx"> if (foundEntryCount % everyNthResourceToDelete)
</span><span class="cx"> return;
</span><span class="cx"> ++deletedCount;
</span><span class="cx">
</span><del>- unlink(path.data());
</del><ins>+ WebCore::deleteFile(WebCore::pathByAppendingComponent(partitionPath, fileName));
</ins><span class="cx">
</span><span class="cx"> NetworkCacheKey::HashType hash;
</span><span class="cx"> if (!NetworkCacheKey::stringToHash(fileName, hash))
</span></span></pre>
</div>
</div>
</body>
</html>