<!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>[163287] trunk/Source</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/163287">163287</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-02 22:19:25 -0800 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDB: Cannot open new databases with the default version
https://bugs.webkit.org/show_bug.cgi?id=128096
Reviewed by Tim Horton.
Source/WebCore:
* Modules/indexeddb/IDBDatabaseBackend.cpp:
(WebCore::IDBDatabaseBackend::openConnectionInternal): Update logic to handle the
current version being NoIntVersion.
* Modules/indexeddb/IDBTransactionBackendOperations.cpp:
(WebCore::IDBDatabaseBackend::VersionChangeOperation::perform): Update ASSERT.
Source/WebKit2:
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata): New databases should
have the magic "no version set" version.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendcpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163286 => 163287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 06:18:12 UTC (rev 163286)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 06:19:25 UTC (rev 163287)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-02 Brady Eidson <beidson@apple.com>
+
+ IDB: Cannot open new databases with the default version
+ https://bugs.webkit.org/show_bug.cgi?id=128096
+
+ Reviewed by Tim Horton.
+
+ * Modules/indexeddb/IDBDatabaseBackend.cpp:
+ (WebCore::IDBDatabaseBackend::openConnectionInternal): Update logic to handle the
+ current version being NoIntVersion.
+
+ * Modules/indexeddb/IDBTransactionBackendOperations.cpp:
+ (WebCore::IDBDatabaseBackend::VersionChangeOperation::perform): Update ASSERT.
+
</ins><span class="cx"> 2014-02-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix context save/restore mistake spotted in SVGInlineTextBox::paintTextWithShadows
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp (163286 => 163287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp 2014-02-03 06:18:12 UTC (rev 163286)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp 2014-02-03 06:19:25 UTC (rev 163287)
</span><span class="lines">@@ -463,31 +463,26 @@
</span><span class="cx"> RefPtr<IDBCallbacks> callbacks = prpCallbacks;
</span><span class="cx"> RefPtr<IDBDatabaseCallbacks> databaseCallbacks = prpDatabaseCallbacks;
</span><span class="cx">
</span><del>- // We infer that the database didn't exist from its lack of either type of version.
</del><ins>+ // We infer that the database didn't exist from its lack of version.
</ins><span class="cx"> bool isNewDatabase = m_metadata.version == IDBDatabaseMetadata::NoIntVersion;
</span><span class="cx">
</span><del>- if (version == IDBDatabaseMetadata::DefaultIntVersion) {
</del><ins>+ if (version == IDBDatabaseMetadata::DefaultIntVersion && !isNewDatabase) {
</ins><span class="cx"> m_databaseCallbacksSet.add(databaseCallbacks);
</span><span class="cx"> callbacks->onSuccess(this, this->metadata());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (version == IDBDatabaseMetadata::NoIntVersion) {
- if (!isNewDatabase) {
- m_databaseCallbacksSet.add(RefPtr<IDBDatabaseCallbacks>(databaseCallbacks));
- callbacks->onSuccess(this, this->metadata());
- return;
- }
</del><ins>+ if (isNewDatabase && version == IDBDatabaseMetadata::DefaultIntVersion) {
</ins><span class="cx"> // Spec says: If no version is specified and no database exists, set database version to 1.
</span><span class="cx"> version = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (version > m_metadata.version) {
</del><ins>+ if (version > m_metadata.version || m_metadata.version == IDBDatabaseMetadata::NoIntVersion) {
</ins><span class="cx"> runIntVersionChangeTransaction(callbacks, databaseCallbacks, transactionId, version);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (version < m_metadata.version) {
</del><ins>+ if (version < m_metadata.version && m_metadata.version != IDBDatabaseMetadata::NoIntVersion) {
</ins><span class="cx"> callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::VersionError, String::format("The requested version (%llu) is less than the existing version (%llu).", static_cast<unsigned long long>(version), static_cast<unsigned long long>(m_metadata.version))));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp (163286 => 163287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2014-02-03 06:18:12 UTC (rev 163286)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2014-02-03 06:19:25 UTC (rev 163287)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t oldVersion = m_transaction->database().metadata().version;
</span><span class="cx"> RefPtr<IDBDatabaseBackend::VersionChangeOperation> operation(this);
</span><del>- ASSERT(static_cast<uint64_t>(m_version) > oldVersion);
</del><ins>+ ASSERT(static_cast<uint64_t>(m_version) > oldVersion || oldVersion == IDBDatabaseMetadata::NoIntVersion);
</ins><span class="cx">
</span><span class="cx"> std::function<void(PassRefPtr<IDBDatabaseError>)> operationCallback = [oldVersion, operation, this, completionCallback](PassRefPtr<IDBDatabaseError> prpError) {
</span><span class="cx"> RefPtr<IDBDatabaseError> error = prpError;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163286 => 163287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-03 06:18:12 UTC (rev 163286)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-03 06:19:25 UTC (rev 163287)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-02 Brady Eidson <beidson@apple.com>
+
+ IDB: Cannot open new databases with the default version
+ https://bugs.webkit.org/show_bug.cgi?id=128096
+
+ Reviewed by Tim Horton.
+
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata): New databases should
+ have the magic "no version set" version.
+
</ins><span class="cx"> 2014-02-02 Sanghyup Lee <sh53.lee@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Add a logic for checking multi touch in GestureRecognizer::noGesture
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (163286 => 163287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-03 06:18:12 UTC (rev 163286)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-03 06:19:25 UTC (rev 163287)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> // Therefore we'll store the version as a String.
</span><span class="cx"> SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO IDBDatabaseInfo VALUES ('DatabaseVersion', ?);"));
</span><span class="cx"> if (sql.prepare() != SQLResultOk
</span><del>- || sql.bindText(1, String::number(0)) != SQLResultOk
</del><ins>+ || sql.bindText(1, String::number(IDBDatabaseMetadata::NoIntVersion)) != SQLResultOk
</ins><span class="cx"> || sql.step() != SQLResultDone) {
</span><span class="cx"> LOG_ERROR("Could not insert default version into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> m_sqliteDB = nullptr;
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> // This initial metadata matches the default values we just put into the metadata database.
</span><span class="cx"> auto metadata = std::make_unique<IDBDatabaseMetadata>();
</span><span class="cx"> metadata->name = m_identifier.databaseName();
</span><del>- metadata->version = 0;
</del><ins>+ metadata->version = IDBDatabaseMetadata::NoIntVersion;
</ins><span class="cx"> metadata->maxObjectStoreId = 1;
</span><span class="cx">
</span><span class="cx"> return metadata;
</span></span></pre>
</div>
</div>
</body>
</html>