<!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>[177172] 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/177172">177172</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 12:17:58 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using SQLiteFileSystem in the storage code
https://bugs.webkit.org/show_bug.cgi?id=139549
Reviewed by Sam Weinig.
Just inline the SQLiteFileSystem calls into their respective call sites.
This is more preparation for moving the old storage code into WebKit proper.
* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::deleteEmptyDatabase):
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::trackerDatabasePath):
(WebCore::ensureDatabaseFileExists):
(WebCore::StorageTracker::openTrackerDatabase):
(WebCore::truncateDatabaseFile):
(WebCore::StorageTracker::syncDeleteAllOrigins):
(WebCore::StorageTracker::syncDeleteOrigin):
(WebCore::StorageTracker::diskUsageForOrigin):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaSynccpp">trunk/Source/WebCore/storage/StorageAreaSync.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageTrackercpp">trunk/Source/WebCore/storage/StorageTracker.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177171 => 177172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-11 20:15:28 UTC (rev 177171)
+++ trunk/Source/WebCore/ChangeLog 2014-12-11 20:17:58 UTC (rev 177172)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-12-11 Anders Carlsson <andersca@apple.com>
+
+ Stop using SQLiteFileSystem in the storage code
+ https://bugs.webkit.org/show_bug.cgi?id=139549
+
+ Reviewed by Sam Weinig.
+
+ Just inline the SQLiteFileSystem calls into their respective call sites.
+ This is more preparation for moving the old storage code into WebKit proper.
+
+ * storage/StorageAreaSync.cpp:
+ (WebCore::StorageAreaSync::deleteEmptyDatabase):
+ * storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::trackerDatabasePath):
+ (WebCore::ensureDatabaseFileExists):
+ (WebCore::StorageTracker::openTrackerDatabase):
+ (WebCore::truncateDatabaseFile):
+ (WebCore::StorageTracker::syncDeleteAllOrigins):
+ (WebCore::StorageTracker::syncDeleteOrigin):
+ (WebCore::StorageTracker::diskUsageForOrigin):
+
</ins><span class="cx"> 2014-12-11 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177155.
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (177171 => 177172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaSync.cpp 2014-12-11 20:15:28 UTC (rev 177171)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp 2014-12-11 20:17:58 UTC (rev 177172)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "SQLiteDatabaseTracker.h"
</span><del>-#include "SQLiteFileSystem.h"
</del><span class="cx"> #include "SQLiteStatement.h"
</span><span class="cx"> #include "SQLiteTransaction.h"
</span><span class="cx"> #include "StorageAreaImpl.h"
</span><span class="lines">@@ -525,7 +524,7 @@
</span><span class="cx"> });
</span><span class="cx"> } else {
</span><span class="cx"> String databaseFilename = m_syncManager->fullDatabaseFilename(m_databaseIdentifier);
</span><del>- if (!SQLiteFileSystem::deleteDatabaseFile(databaseFilename))
</del><ins>+ if (!deleteFile(databaseFilename))
</ins><span class="cx"> LOG_ERROR("Failed to delete database file %s\n", databaseFilename.utf8().data());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (177171 => 177172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageTracker.cpp 2014-12-11 20:15:28 UTC (rev 177171)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2014-12-11 20:17:58 UTC (rev 177172)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "SQLiteDatabaseTracker.h"
</span><del>-#include "SQLiteFileSystem.h"
</del><span class="cx"> #include "SQLiteStatement.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "StorageThread.h"
</span><span class="lines">@@ -40,6 +39,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include <sqlite3_private.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static StorageTracker* storageTracker = 0;
</span><span class="lines">@@ -123,9 +126,17 @@
</span><span class="cx"> String StorageTracker::trackerDatabasePath()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_databaseMutex.tryLock());
</span><del>- return SQLiteFileSystem::appendDatabaseFileNameToPath(m_storageDirectoryPath, "StorageTracker.db");
</del><ins>+ return pathByAppendingComponent(m_storageDirectoryPath, "StorageTracker.db");
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool ensureDatabaseFileExists(const String& fileName, bool createIfDoesNotExist)
+{
+ if (createIfDoesNotExist)
+ return makeAllDirectories(directoryName(fileName));
+
+ return fileExists(fileName);
+}
+
</ins><span class="cx"> void StorageTracker::openTrackerDatabase(bool createIfDoesNotExist)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_isActive);
</span><span class="lines">@@ -140,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> String databasePath = trackerDatabasePath();
</span><span class="cx">
</span><del>- if (!SQLiteFileSystem::ensureDatabaseFileExists(databasePath, createIfDoesNotExist)) {
</del><ins>+ if (!ensureDatabaseFileExists(databasePath, createIfDoesNotExist)) {
</ins><span class="cx"> if (createIfDoesNotExist)
</span><span class="cx"> LOG_ERROR("Failed to create database file '%s'", databasePath.ascii().data());
</span><span class="cx"> return;
</span><span class="lines">@@ -392,7 +403,14 @@
</span><span class="cx"> syncDeleteAllOrigins();
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if PLATFORM(IOS)
+static void truncateDatabaseFile(SQLiteDatabase& database)
+{
+ sqlite3_file_control(database.sqlite3Handle(), 0, SQLITE_TRUNCATE_DATABASE, 0);
+}
+#endif
+
</ins><span class="cx"> void StorageTracker::syncDeleteAllOrigins()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="lines">@@ -416,7 +434,7 @@
</span><span class="cx"> if (!canDeleteOrigin(statement.getColumnText(0)))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- SQLiteFileSystem::deleteDatabaseFile(statement.getColumnText(1));
</del><ins>+ deleteFile(statement.getColumnText(1));
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_clientMutex);
</span><span class="lines">@@ -430,13 +448,13 @@
</span><span class="cx">
</span><span class="cx"> if (m_database.isOpen()) {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- SQLiteFileSystem::truncateDatabaseFile(m_database.sqlite3Handle());
</del><ins>+ truncateDatabaseFile(m_database.sqlite3Handle());
</ins><span class="cx"> #endif
</span><span class="cx"> m_database.close();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- if (!SQLiteFileSystem::deleteDatabaseFile(trackerDatabasePath())) {
</del><ins>+ if (!deleteFile(trackerDatabasePath())) {
</ins><span class="cx"> // In the case where it is not possible to delete the database file (e.g some other program
</span><span class="cx"> // like a virus scanner is accessing it), make sure to remove all entries.
</span><span class="cx"> openTrackerDatabase(false);
</span><span class="lines">@@ -452,7 +470,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- SQLiteFileSystem::deleteEmptyDatabaseDirectory(m_storageDirectoryPath);
</del><ins>+ deleteEmptyDirectory(m_storageDirectoryPath);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -527,7 +545,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SQLiteFileSystem::deleteDatabaseFile(path);
</del><ins>+ deleteFile(path);
</ins><span class="cx">
</span><span class="cx"> bool shouldDeleteTrackerFiles = false;
</span><span class="cx"> {
</span><span class="lines">@@ -538,12 +556,12 @@
</span><span class="cx">
</span><span class="cx"> if (shouldDeleteTrackerFiles) {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- SQLiteFileSystem::truncateDatabaseFile(m_database.sqlite3Handle());
</del><ins>+ truncateDatabaseFile(m_database);
</ins><span class="cx"> #endif
</span><span class="cx"> m_database.close();
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- SQLiteFileSystem::deleteDatabaseFile(trackerDatabasePath());
- SQLiteFileSystem::deleteEmptyDatabaseDirectory(m_storageDirectoryPath);
</del><ins>+ deleteFile(trackerDatabasePath());
+ deleteEmptyDirectory(m_storageDirectoryPath);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -635,7 +653,8 @@
</span><span class="cx"> if (path.isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return SQLiteFileSystem::getDatabaseFileSize(path);
</del><ins>+ long long size;
+ return getFileSize(path, size) ? size : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>