<!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>[160659] 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/160659">160659</a></dd>

<dt>Author</dt> <dd>beidson@apple.com</dd>

<dt>Date</dt> <dd>2013-12-16 13:26:59 -0800 (Mon, 16 Dec 2013)</dd>

</dl>

<h3>Log Message</h3>

<pre>DatabaseProcess: Fix a few bugs with opening an IDB connection

https://bugs.webkit.org/show_bug.cgi?id=125798

Reviewed by Alexey Proskuryakov.

Source/WebCore:

* Modules/indexeddb/IDBDatabaseBackend.cpp:

(WebCore::IDBDatabaseBackend::processPendingCalls): As the comment says, we should only

  early return when there *are* pending delete calls. The logic here was backwards,

  preventing the backend from ever getting to processPendingOpenCalls().

Source/WebKit2:

Database metadata always needs a non-zero database identifier, unique at runtime.

* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:

(WebKit::generateDatabaseId):

(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):</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="#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 (160658 => 160659)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-12-16 21:23:53 UTC (rev 160658)

+++ trunk/Source/WebCore/ChangeLog        2013-12-16 21:26:59 UTC (rev 160659)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2013-12-16  Brady Eidson  &lt;beidson@apple.com&gt;

+

+        DatabaseProcess: Fix a few bugs with opening an IDB connection

+        https://bugs.webkit.org/show_bug.cgi?id=125798

+

+        Reviewed by Alexey Proskuryakov.

+

+        * Modules/indexeddb/IDBDatabaseBackend.cpp:

+        (WebCore::IDBDatabaseBackend::processPendingCalls): As the comment says, we should only

+          early return when there *are* pending delete calls. The logic here was backwards,

+          preventing the backend from ever getting to processPendingOpenCalls().

+

</ins><span class="cx"> 2013-12-16  Alex Christensen  &lt;achristensen@webkit.org&gt;

</span><span class="cx"> 

<span class="cx">         Fixed Win64 build on VS2013.

</span></span></pre></div>

<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp (160658 => 160659)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp        2013-12-16 21:23:53 UTC (rev 160658)

+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp        2013-12-16 21:26:59 UTC (rev 160659)

</span><span class="lines">@@ -391,7 +391,7 @@

</span><span class="cx"> 

<span class="cx">     // If there are any database deletions waiting for completion, we're done for now.

<span class="cx">     // Further callbacks will be handled in a future call to processPendingCalls().

</span><del>-    if (m_deleteCallbacksWaitingCompletion.isEmpty())

</del><ins>+    if (!m_deleteCallbacksWaitingCompletion.isEmpty())

</ins><span class="cx">         return;

</span><span class="cx"> 

</span><span class="cx">     if (m_runningVersionChangeTransaction)

</span></span></pre></div>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160658 => 160659)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-12-16 21:23:53 UTC (rev 160658)

+++ trunk/Source/WebKit2/ChangeLog        2013-12-16 21:26:59 UTC (rev 160659)

</span><span class="lines">@@ -1,3 +1,16 @@

</span><ins>+2013-12-16  Brady Eidson  &lt;beidson@apple.com&gt;

+

+        DatabaseProcess: Fix a few bugs with opening an IDB connection

+        https://bugs.webkit.org/show_bug.cgi?id=125798

+

+        Reviewed by Alexey Proskuryakov.

+

+        Database metadata always needs a non-zero database identifier, unique at runtime.

+

+        * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:

+        (WebKit::generateDatabaseId):

+        (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):

+

</ins><span class="cx"> 2013-12-16  Anders Carlsson  &lt;andersca@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         UserData should encode and decode API::Data objects

</span></span></pre></div>

<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (160658 => 160659)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp        2013-12-16 21:23:53 UTC (rev 160658)

+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp        2013-12-16 21:26:59 UTC (rev 160659)

</span><span class="lines">@@ -41,6 +41,14 @@

<span class="cx"> // Current version of the metadata schema being used in the metadata database.

</span><span class="cx"> static const int currentMetadataVersion = 1;

</span><span class="cx"> 

</span><ins>+static int64_t generateDatabaseId()

+{

+    static int64_t databaseID = 0;

+

+    ASSERT(!isMainThread());

+    return ++databaseID;

+}

+

</ins><span class="cx"> UniqueIDBDatabaseBackingStoreSQLite::UniqueIDBDatabaseBackingStoreSQLite(const UniqueIDBDatabaseIdentifier&amp; identifier, const String&amp; databaseDirectory)

</span><span class="cx">     : m_identifier(identifier)

</span><span class="cx">     , m_absoluteDatabaseDirectory(databaseDirectory)

</span><span class="lines">@@ -173,6 +181,9 @@

</span><span class="cx">     if (!metadata)

</span><span class="cx">         LOG_ERROR(&quot;Unable to establish IDB database at path '%s'&quot;, metadataDBFilename.utf8().data());

</span><span class="cx"> 

<ins>+    // The database id is a runtime concept and doesn't need to be stored in the metadata database.

+    metadata-&gt;id = generateDatabaseId();

+

</ins><span class="cx">     return metadata;

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>