<!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>[161029] 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/161029">161029</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 15:28:53 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Upstream WebCore/storage changes
https://bugs.webkit.org/show_bug.cgi?id=125913
Reviewed by David Kilzer.
* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::openDatabase): Added iOS-specific code.
(WebCore::StorageAreaSync::sync): Ditto.
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::openTrackerDatabase): Ditto.
(WebCore::StorageTracker::syncImportOriginIdentifiers): Ditto.
(WebCore::StorageTracker::syncFileSystemAndTrackerDatabase): Ditto.
(WebCore::StorageTracker::syncSetOriginDetails): Ditto.
(WebCore::StorageTracker::syncDeleteAllOrigins): Ditto.
(WebCore::StorageTracker::syncDeleteOrigin): Ditto.
(WebCore::StorageTracker::databasePathForOrigin): Ditto.</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 (161028 => 161029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-23 23:25:31 UTC (rev 161028)
+++ trunk/Source/WebCore/ChangeLog 2013-12-23 23:28:53 UTC (rev 161029)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2013-12-23 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Upstream WebCore/storage changes
+ https://bugs.webkit.org/show_bug.cgi?id=125913
+
+ Reviewed by David Kilzer.
+
+ * storage/StorageAreaSync.cpp:
+ (WebCore::StorageAreaSync::openDatabase): Added iOS-specific code.
+ (WebCore::StorageAreaSync::sync): Ditto.
+ * storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::openTrackerDatabase): Ditto.
+ (WebCore::StorageTracker::syncImportOriginIdentifiers): Ditto.
+ (WebCore::StorageTracker::syncFileSystemAndTrackerDatabase): Ditto.
+ (WebCore::StorageTracker::syncSetOriginDetails): Ditto.
+ (WebCore::StorageTracker::syncDeleteAllOrigins): Ditto.
+ (WebCore::StorageTracker::syncDeleteOrigin): Ditto.
+ (WebCore::StorageTracker::databasePathForOrigin): Ditto.
+
+2013-12-23 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> Fix the iOS build following <http://trac.webkit.org/changeset/160236>
</span><span class="cx"> (https://bugs.webkit.org/show_bug.cgi?id=125239)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (161028 => 161029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaSync.cpp 2013-12-23 23:25:31 UTC (rev 161028)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp 2013-12-23 23:28:53 UTC (rev 161029)
</span><span class="lines">@@ -41,6 +41,10 @@
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include "SQLiteDatabaseTracker.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // If the StorageArea undergoes rapid changes, don't sync each change to disk.
</span><span class="lines">@@ -232,6 +236,9 @@
</span><span class="cx"> ASSERT(!m_database.isOpen());
</span><span class="cx"> ASSERT(!m_databaseOpenFailed);
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx"> String databaseFilename = m_syncManager->fullDatabaseFilename(m_databaseIdentifier);
</span><span class="cx">
</span><span class="cx"> if (!fileExists(databaseFilename) && openingStrategy == SkipIfNonExistent)
</span><span class="lines">@@ -403,6 +410,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx"> // If the clear flag is set, then we clear all items out before we write any new ones in.
</span><span class="cx"> if (clearItems) {
</span><span class="cx"> SQLiteStatement clear(m_database, "DELETE FROM ItemTable");
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (161028 => 161029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageTracker.cpp 2013-12-23 23:25:31 UTC (rev 161028)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2013-12-23 23:28:53 UTC (rev 161029)
</span><span class="lines">@@ -42,6 +42,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 "SQLiteDatabaseTracker.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static StorageTracker* storageTracker = 0;
</span><span class="lines">@@ -132,6 +136,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_isActive);
</span><span class="cx"> ASSERT(!isMainThread());
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx"> ASSERT(!m_databaseMutex.tryLock());
</span><span class="cx">
</span><span class="cx"> if (m_database.isOpen())
</span><span class="lines">@@ -192,6 +199,9 @@
</span><span class="cx"> openTrackerDatabase(false);
</span><span class="cx">
</span><span class="cx"> if (m_database.isOpen()) {
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx"> SQLiteStatement statement(m_database, "SELECT origin FROM Origins");
</span><span class="cx"> if (statement.prepare() != SQLResultOk) {
</span><span class="cx"> LOG_ERROR("Failed to prepare statement.");
</span><span class="lines">@@ -232,6 +242,9 @@
</span><span class="cx"> void StorageTracker::syncFileSystemAndTrackerDatabase()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx"> ASSERT(m_isActive);
</span><span class="cx">
</span><span class="cx"> Vector<String> paths;
</span><span class="lines">@@ -304,6 +317,9 @@
</span><span class="cx"> void StorageTracker::syncSetOriginDetails(const String& originIdentifier, const String& databaseFile)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx">
</span><span class="cx"> MutexLocker locker(m_databaseMutex);
</span><span class="cx">
</span><span class="lines">@@ -373,6 +389,9 @@
</span><span class="cx"> void StorageTracker::syncDeleteAllOrigins()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx">
</span><span class="cx"> MutexLocker locker(m_databaseMutex);
</span><span class="cx">
</span><span class="lines">@@ -402,10 +421,15 @@
</span><span class="cx">
</span><span class="cx"> if (result != SQLResultDone)
</span><span class="cx"> LOG_ERROR("Failed to read in all origins from the database.");
</span><del>-
- if (m_database.isOpen())
</del><ins>+
+ if (m_database.isOpen()) {
+#if PLATFORM(IOS)
+ SQLiteFileSystem::truncateDatabaseFile(m_database.sqlite3Handle());
+#endif
</ins><span class="cx"> m_database.close();
</span><del>-
</del><ins>+ }
+
+#if !PLATFORM(IOS)
</ins><span class="cx"> if (!SQLiteFileSystem::deleteDatabaseFile(trackerDatabasePath())) {
</span><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="lines">@@ -423,6 +447,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> SQLiteFileSystem::deleteEmptyDatabaseDirectory(m_storageDirectoryPath);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageTracker::deleteOriginWithIdentifier(const String& originIdentifier)
</span><span class="lines">@@ -461,6 +486,9 @@
</span><span class="cx"> void StorageTracker::syncDeleteOrigin(const String& originIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><ins>+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
</ins><span class="cx">
</span><span class="cx"> MutexLocker locker(m_databaseMutex);
</span><span class="cx">
</span><span class="lines">@@ -501,9 +529,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shouldDeleteTrackerFiles) {
</span><ins>+#if PLATFORM(IOS)
+ SQLiteFileSystem::truncateDatabaseFile(m_database.sqlite3Handle());
+#endif
</ins><span class="cx"> m_database.close();
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> SQLiteFileSystem::deleteDatabaseFile(trackerDatabasePath());
</span><span class="cx"> SQLiteFileSystem::deleteEmptyDatabaseDirectory(m_storageDirectoryPath);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><span class="lines">@@ -567,7 +600,11 @@
</span><span class="cx">
</span><span class="cx"> if (!m_database.isOpen())
</span><span class="cx"> return String();
</span><del>-
</del><ins>+
+#if PLATFORM(IOS)
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+#endif
+
</ins><span class="cx"> SQLiteStatement pathStatement(m_database, "SELECT path FROM Origins WHERE origin=?");
</span><span class="cx"> if (pathStatement.prepare() != SQLResultOk) {
</span><span class="cx"> LOG_ERROR("Unable to prepare selection of path for origin '%s'", originIdentifier.ascii().data());
</span></span></pre>
</div>
</div>
</body>
</html>