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

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

<dt>Date</dt> <dd>2015-08-04 18:32:38 -0700 (Tue, 04 Aug 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>CTTE the database task code

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

Reviewed by Andreas Kling.

* Modules/webdatabase/Database.cpp:

(WebCore::Database::openAndVerifyVersion):

(WebCore::Database::markAsDeletedAndClose):

(WebCore::Database::tableNames):

* Modules/webdatabase/DatabaseTask.cpp:

(WebCore::DatabaseTask::DatabaseTask):

(WebCore::DatabaseTask::performTask):

(WebCore::DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask):

(WebCore::DatabaseBackend::DatabaseOpenTask::doPerformTask):

(WebCore::DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask):

(WebCore::DatabaseBackend::DatabaseCloseTask::doPerformTask):

(WebCore::DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask):

(WebCore::DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask):

(WebCore::DatabaseBackend::DatabaseTableNamesTask::doPerformTask):

* Modules/webdatabase/DatabaseTask.h:

(WebCore::DatabaseTask::database):

* Modules/webdatabase/DatabaseThread.cpp:

(WebCore::SameDatabasePredicate::operator()):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>

<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTaskcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp</a></li>

<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh">trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h</a></li>

<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187930 => 187931)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-08-05 01:26:16 UTC (rev 187930)

+++ trunk/Source/WebCore/ChangeLog        2015-08-05 01:32:38 UTC (rev 187931)

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

</span><ins>+2015-08-04  Anders Carlsson  &lt;andersca@apple.com&gt;

+

+        CTTE the database task code

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

+

+        Reviewed by Andreas Kling.

+

+        * Modules/webdatabase/Database.cpp:

+        (WebCore::Database::openAndVerifyVersion):

+        (WebCore::Database::markAsDeletedAndClose):

+        (WebCore::Database::tableNames):

+        * Modules/webdatabase/DatabaseTask.cpp:

+        (WebCore::DatabaseTask::DatabaseTask):

+        (WebCore::DatabaseTask::performTask):

+        (WebCore::DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask):

+        (WebCore::DatabaseBackend::DatabaseOpenTask::doPerformTask):

+        (WebCore::DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask):

+        (WebCore::DatabaseBackend::DatabaseCloseTask::doPerformTask):

+        (WebCore::DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask):

+        (WebCore::DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask):

+        (WebCore::DatabaseBackend::DatabaseTableNamesTask::doPerformTask):

+        * Modules/webdatabase/DatabaseTask.h:

+        (WebCore::DatabaseTask::database):

+        * Modules/webdatabase/DatabaseThread.cpp:

+        (WebCore::SameDatabasePredicate::operator()):

+

</ins><span class="cx"> 2015-08-04  Brent Fulgham  &lt;bfulgham@apple.com&gt;

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

<span class="cx">         REGRESSION (r173784): [Mac] Correct latching error for non-scrollable iframe nested inside scrollable div.

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

<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (187930 => 187931)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp        2015-08-05 01:26:16 UTC (rev 187930)

+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp        2015-08-05 01:32:38 UTC (rev 187931)

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

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

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

</span><span class="cx">     bool success = false;

</span><del>-    auto task = std::make_unique&lt;DatabaseOpenTask&gt;(this, setVersionInNewDatabase, &amp;synchronizer, error, errorMessage, success);

</del><ins>+    auto task = std::make_unique&lt;DatabaseOpenTask&gt;(*this, setVersionInNewDatabase, synchronizer, error, errorMessage, success);

</ins><span class="cx">     databaseContext()-&gt;databaseThread()-&gt;scheduleImmediateTask(WTF::move(task));

</span><span class="cx">     synchronizer.waitForTaskCompletion();

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

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

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

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

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

</span><del>-    auto task = std::make_unique&lt;DatabaseCloseTask&gt;(this, &amp;synchronizer);

</del><ins>+    auto task = std::make_unique&lt;DatabaseCloseTask&gt;(*this, synchronizer);

</ins><span class="cx">     databaseContext()-&gt;databaseThread()-&gt;scheduleImmediateTask(WTF::move(task));

</span><span class="cx">     synchronizer.waitForTaskCompletion();

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

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

</span><span class="cx">     if (!databaseContext()-&gt;databaseThread() || databaseContext()-&gt;databaseThread()-&gt;terminationRequested(&amp;synchronizer))

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

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

</span><del>-    auto task = std::make_unique&lt;DatabaseTableNamesTask&gt;(this, &amp;synchronizer, result);

</del><ins>+    auto task = std::make_unique&lt;DatabaseTableNamesTask&gt;(*this, synchronizer, result);

</ins><span class="cx">     databaseContext()-&gt;databaseThread()-&gt;scheduleImmediateTask(WTF::move(task));

</span><span class="cx">     synchronizer.waitForTaskCompletion();

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

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

<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp (187930 => 187931)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp        2015-08-05 01:26:16 UTC (rev 187930)

+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp        2015-08-05 01:32:38 UTC (rev 187931)

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

</span><span class="cx">     m_synchronousMutex.unlock();

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

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

</span><del>-DatabaseTask::DatabaseTask(DatabaseBackend* database, DatabaseTaskSynchronizer* synchronizer)

</del><ins>+DatabaseTask::DatabaseTask(DatabaseBackend&amp; database, DatabaseTaskSynchronizer* synchronizer)

</ins><span class="cx">     : m_database(database)

</span><span class="cx">     , m_synchronizer(synchronizer)

</span><span class="cx"> #if !LOG_DISABLED

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

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

</span><span class="cx">     LOG(StorageAPI, &quot;Performing %s %p\n&quot;, debugTaskName(), this);

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

</span><del>-#if !PLATFORM(IOS)

-    m_database-&gt;resetAuthorizer();

-#else

-    if (m_database)

-        m_database-&gt;resetAuthorizer();

-#endif

</del><ins>+    m_database.resetAuthorizer();

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

</span><span class="cx">     doPerformTask();

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

</span><span class="lines">@@ -103,20 +98,19 @@

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

<span class="cx"> // Opens the database file and verifies the version matches the expected version.

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

</span><del>-DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask(DatabaseBackend* database, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, DatabaseError&amp; error, String&amp; errorMessage, bool&amp; success)

-    : DatabaseTask(database, synchronizer)

</del><ins>+DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask(DatabaseBackend&amp; database, bool setVersionInNewDatabase, DatabaseTaskSynchronizer&amp; synchronizer, DatabaseError&amp; error, String&amp; errorMessage, bool&amp; success)

+    : DatabaseTask(database, &amp;synchronizer)

</ins><span class="cx">     , m_setVersionInNewDatabase(setVersionInNewDatabase)

</span><span class="cx">     , m_error(error)

</span><span class="cx">     , m_errorMessage(errorMessage)

</span><span class="cx">     , m_success(success)

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

<del>-    ASSERT(synchronizer); // A task with output parameters is supposed to be synchronous.

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

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

</span><span class="cx"> void DatabaseBackend::DatabaseOpenTask::doPerformTask()

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

</span><span class="cx">     String errorMessage;

</span><del>-    m_success = database()-&gt;performOpenAndVerify(m_setVersionInNewDatabase, m_error, errorMessage);

</del><ins>+    m_success = database().performOpenAndVerify(m_setVersionInNewDatabase, m_error, errorMessage);

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

</span><span class="cx">         m_errorMessage = errorMessage.isolatedCopy();

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

</span><span class="lines">@@ -131,14 +125,14 @@

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

<span class="cx"> // Closes the database.

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

</span><del>-DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask(DatabaseBackend* database, DatabaseTaskSynchronizer* synchronizer)

-    : DatabaseTask(database, synchronizer)

</del><ins>+DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask(DatabaseBackend&amp; database, DatabaseTaskSynchronizer&amp; synchronizer)

+    : DatabaseTask(database, &amp;synchronizer)

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

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

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

</span><span class="cx"> void DatabaseBackend::DatabaseCloseTask::doPerformTask()

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

</span><del>-    Database::from(database())-&gt;close();

</del><ins>+    Database::from(&amp;database())-&gt;close();

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

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

</span><span class="cx"> #if !LOG_DISABLED

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

<span class="cx"> // Starts a transaction that will report its results via a callback.

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

</span><span class="cx"> DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask(PassRefPtr&lt;SQLTransactionBackend&gt; transaction)

</span><del>-    : DatabaseTask(Database::from(transaction-&gt;database()), 0)

</del><ins>+    : DatabaseTask(*Database::from(transaction-&gt;database()), 0)

</ins><span class="cx">     , m_transaction(transaction)

</span><span class="cx">     , m_didPerformTask(false)

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

</span><span class="lines">@@ -188,16 +182,15 @@

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

<span class="cx"> // Retrieves a list of all tables in the database - for WebInspector support.

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

</span><del>-DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask(DatabaseBackend* database, DatabaseTaskSynchronizer* synchronizer, Vector&lt;String&gt;&amp; names)

-    : DatabaseTask(database, synchronizer)

</del><ins>+DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask(DatabaseBackend&amp; database, DatabaseTaskSynchronizer&amp; synchronizer, Vector&lt;String&gt;&amp; names)

+    : DatabaseTask(database, &amp;synchronizer)

</ins><span class="cx">     , m_tableNames(names)

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

<del>-    ASSERT(synchronizer); // A task with output parameters is supposed to be synchronous.

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

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

</span><span class="cx"> void DatabaseBackend::DatabaseTableNamesTask::doPerformTask()

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

</span><del>-    m_tableNames = Database::from(database())-&gt;performGetTableNames();

</del><ins>+    m_tableNames = Database::from(&amp;database())-&gt;performGetTableNames();

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

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

</span><span class="cx"> #if !LOG_DISABLED

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

<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h (187930 => 187931)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h        2015-08-05 01:26:16 UTC (rev 187930)

+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h        2015-08-05 01:32:38 UTC (rev 187931)

</span><span class="lines">@@ -73,19 +73,19 @@

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

</span><span class="cx">     void performTask();

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

</span><del>-    DatabaseBackend* database() const { return m_database; }

</del><ins>+    DatabaseBackend&amp; database() const { return m_database; }

</ins><span class="cx"> #ifndef NDEBUG

</span><span class="cx">     bool hasSynchronizer() const { return m_synchronizer; }

</span><span class="cx">     bool hasCheckedForTermination() const { return m_synchronizer-&gt;hasCheckedForTermination(); }

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

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

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

</span><del>-    DatabaseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);

</del><ins>+    DatabaseTask(DatabaseBackend&amp;, DatabaseTaskSynchronizer*);

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

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

</span><span class="cx">     virtual void doPerformTask() = 0;

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

</span><del>-    DatabaseBackend* m_database;

</del><ins>+    DatabaseBackend&amp; m_database;

</ins><span class="cx">     DatabaseTaskSynchronizer* m_synchronizer;

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

</span><span class="cx"> #if !LOG_DISABLED

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

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

</span><span class="cx"> class DatabaseBackend::DatabaseOpenTask : public DatabaseTask {

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

</span><del>-    DatabaseOpenTask(DatabaseBackend*, bool setVersionInNewDatabase, DatabaseTaskSynchronizer*, DatabaseError&amp;, String&amp; errorMessage, bool&amp; success);

</del><ins>+    DatabaseOpenTask(DatabaseBackend&amp;, bool setVersionInNewDatabase, DatabaseTaskSynchronizer&amp;, DatabaseError&amp;, String&amp; errorMessage, bool&amp; success);

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

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

</span><span class="cx">     virtual void doPerformTask() override;

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

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

</span><span class="cx"> class DatabaseBackend::DatabaseCloseTask : public DatabaseTask {

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

</span><del>-    DatabaseCloseTask(DatabaseBackend*, DatabaseTaskSynchronizer*);

</del><ins>+    DatabaseCloseTask(DatabaseBackend&amp;, DatabaseTaskSynchronizer&amp;);

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

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

</span><span class="cx">     virtual void doPerformTask() override;

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

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

</span><span class="cx"> class DatabaseBackend::DatabaseTableNamesTask : public DatabaseTask {

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

</span><del>-    DatabaseTableNamesTask(DatabaseBackend*, DatabaseTaskSynchronizer*, Vector&lt;String&gt;&amp; names);

</del><ins>+    DatabaseTableNamesTask(DatabaseBackend&amp;, DatabaseTaskSynchronizer&amp;, Vector&lt;String&gt;&amp; names);

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

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

</span><span class="cx">     virtual void doPerformTask() override;

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

<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp (187930 => 187931)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp        2015-08-05 01:26:16 UTC (rev 187930)

+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp        2015-08-05 01:32:38 UTC (rev 187931)

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

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

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

</span><span class="cx">     SameDatabasePredicate(const Database* database) : m_database(database) { }

</span><del>-    bool operator()(const DatabaseTask&amp; task) const { return task.database() == m_database; }

</del><ins>+    bool operator()(const DatabaseTask&amp; task) const { return &amp;task.database() == m_database; }

</ins><span class="cx"> private:

</span><span class="cx">     const Database* m_database;

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

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

</div>

</div>

</body>

</html>