<!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>[187974] 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/187974">187974</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 12:31:35 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of DatabaseBackend as another step towards merging Database and DatabaseBackendBase
https://bugs.webkit.org/show_bug.cgi?id=147687
Reviewed by Tim Horton.
* CMakeLists.txt:
* Modules/webdatabase/ChangeVersionWrapper.cpp:
(WebCore::ChangeVersionWrapper::performPreflight):
(WebCore::ChangeVersionWrapper::performPostflight):
* Modules/webdatabase/Database.cpp:
(WebCore::Database::Database):
(WebCore::Database::close):
(WebCore::Database::from): Deleted.
(WebCore::Database::backend): Deleted.
* Modules/webdatabase/Database.h:
* Modules/webdatabase/DatabaseBackend.cpp: Removed.
(WebCore::DatabaseBackend::DatabaseBackend): Deleted.
* Modules/webdatabase/DatabaseBackend.h: Removed.
* Modules/webdatabase/DatabaseManager.cpp:
* Modules/webdatabase/DatabaseServer.cpp:
* Modules/webdatabase/DatabaseTask.cpp:
(WebCore::DatabaseTask::DatabaseTask):
(WebCore::DatabaseOpenTask::DatabaseOpenTask):
(WebCore::DatabaseOpenTask::doPerformTask):
(WebCore::DatabaseOpenTask::debugTaskName):
(WebCore::DatabaseCloseTask::DatabaseCloseTask):
(WebCore::DatabaseCloseTask::doPerformTask):
(WebCore::DatabaseCloseTask::debugTaskName):
(WebCore::DatabaseTransactionTask::DatabaseTransactionTask):
(WebCore::DatabaseTransactionTask::~DatabaseTransactionTask):
(WebCore::DatabaseTransactionTask::doPerformTask):
(WebCore::DatabaseTransactionTask::debugTaskName):
(WebCore::DatabaseTableNamesTask::DatabaseTableNamesTask):
(WebCore::DatabaseTableNamesTask::doPerformTask):
(WebCore::DatabaseTableNamesTask::debugTaskName):
(WebCore::DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask): Deleted.
(WebCore::DatabaseBackend::DatabaseOpenTask::doPerformTask): Deleted.
(WebCore::DatabaseBackend::DatabaseOpenTask::debugTaskName): Deleted.
(WebCore::DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask): Deleted.
(WebCore::DatabaseBackend::DatabaseCloseTask::doPerformTask): Deleted.
(WebCore::DatabaseBackend::DatabaseCloseTask::debugTaskName): Deleted.
(WebCore::DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask): Deleted.
(WebCore::DatabaseBackend::DatabaseTransactionTask::~DatabaseTransactionTask): Deleted.
(WebCore::DatabaseBackend::DatabaseTransactionTask::doPerformTask): Deleted.
(WebCore::DatabaseBackend::DatabaseTransactionTask::debugTaskName): Deleted.
(WebCore::DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask): Deleted.
(WebCore::DatabaseBackend::DatabaseTableNamesTask::doPerformTask): Deleted.
(WebCore::DatabaseBackend::DatabaseTableNamesTask::debugTaskName): Deleted.
* Modules/webdatabase/DatabaseTask.h:
(WebCore::DatabaseTask::database):
* Modules/webdatabase/SQLStatementBackend.cpp:
(WebCore::SQLStatementBackend::execute):
* Modules/webdatabase/SQLStatementBackend.h:
* Modules/webdatabase/SQLTransactionBackend.cpp:
(WebCore::SQLTransactionBackend::executeSQL):
(WebCore::SQLTransactionBackend::openTransactionAndPreflight):
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseChangeVersionWrappercpp">trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseh">trunk/Source/WebCore/Modules/webdatabase/Database.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.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="#trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendcpp">trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendh">trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -1003,7 +1003,6 @@
</span><span class="cx"> Modules/webdatabase/DOMWindowWebDatabase.cpp
</span><span class="cx"> Modules/webdatabase/Database.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseAuthorizer.cpp
</span><del>- Modules/webdatabase/DatabaseBackend.cpp
</del><span class="cx"> Modules/webdatabase/DatabaseBackendBase.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseContext.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseManager.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2015-08-05 Anders Carlsson <andersca@apple.com>
+
+ Get rid of DatabaseBackend as another step towards merging Database and DatabaseBackendBase
+ https://bugs.webkit.org/show_bug.cgi?id=147687
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * Modules/webdatabase/ChangeVersionWrapper.cpp:
+ (WebCore::ChangeVersionWrapper::performPreflight):
+ (WebCore::ChangeVersionWrapper::performPostflight):
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::Database):
+ (WebCore::Database::close):
+ (WebCore::Database::from): Deleted.
+ (WebCore::Database::backend): Deleted.
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/DatabaseBackend.cpp: Removed.
+ (WebCore::DatabaseBackend::DatabaseBackend): Deleted.
+ * Modules/webdatabase/DatabaseBackend.h: Removed.
+ * Modules/webdatabase/DatabaseManager.cpp:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ * Modules/webdatabase/DatabaseTask.cpp:
+ (WebCore::DatabaseTask::DatabaseTask):
+ (WebCore::DatabaseOpenTask::DatabaseOpenTask):
+ (WebCore::DatabaseOpenTask::doPerformTask):
+ (WebCore::DatabaseOpenTask::debugTaskName):
+ (WebCore::DatabaseCloseTask::DatabaseCloseTask):
+ (WebCore::DatabaseCloseTask::doPerformTask):
+ (WebCore::DatabaseCloseTask::debugTaskName):
+ (WebCore::DatabaseTransactionTask::DatabaseTransactionTask):
+ (WebCore::DatabaseTransactionTask::~DatabaseTransactionTask):
+ (WebCore::DatabaseTransactionTask::doPerformTask):
+ (WebCore::DatabaseTransactionTask::debugTaskName):
+ (WebCore::DatabaseTableNamesTask::DatabaseTableNamesTask):
+ (WebCore::DatabaseTableNamesTask::doPerformTask):
+ (WebCore::DatabaseTableNamesTask::debugTaskName):
+ (WebCore::DatabaseBackend::DatabaseOpenTask::DatabaseOpenTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseOpenTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseOpenTask::debugTaskName): Deleted.
+ (WebCore::DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseCloseTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseCloseTask::debugTaskName): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::~DatabaseTransactionTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTransactionTask::debugTaskName): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTableNamesTask::DatabaseTableNamesTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTableNamesTask::doPerformTask): Deleted.
+ (WebCore::DatabaseBackend::DatabaseTableNamesTask::debugTaskName): Deleted.
+ * Modules/webdatabase/DatabaseTask.h:
+ (WebCore::DatabaseTask::database):
+ * Modules/webdatabase/SQLStatementBackend.cpp:
+ (WebCore::SQLStatementBackend::execute):
+ * Modules/webdatabase/SQLStatementBackend.h:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::executeSQL):
+ (WebCore::SQLTransactionBackend::openTransactionAndPreflight):
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-08-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename Mutex to DeprecatedMutex
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseChangeVersionWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(transaction && transaction->database());
</span><span class="cx">
</span><del>- DatabaseBackend* database = transaction->database();
</del><ins>+ Database* database = transaction->database();
</ins><span class="cx">
</span><span class="cx"> String actualVersion;
</span><span class="cx"> if (!database->getVersionFromDatabase(actualVersion)) {
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(transaction && transaction->database());
</span><span class="cx">
</span><del>- DatabaseBackend* database = transaction->database();
</del><ins>+ Database* database = transaction->database();
</ins><span class="cx">
</span><span class="cx"> if (!database->setVersionInDatabase(m_newVersion)) {
</span><span class="cx"> int sqliteError = database->sqliteDatabase().lastError();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -70,7 +70,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Database::Database(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
</span><del>- : DatabaseBackend(databaseContext.get(), name, expectedVersion, displayName, estimatedSize)
</del><ins>+ : DatabaseBackendBase(databaseContext.get(), name, expectedVersion, displayName, estimatedSize)
+ , m_transactionInProgress(false)
+ , m_isTransactionQueueEnabled(true)
</ins><span class="cx"> , m_scriptExecutionContext(databaseContext->scriptExecutionContext())
</span><span class="cx"> , m_databaseContext(databaseContext)
</span><span class="cx"> , m_deleted(false)
</span><span class="lines">@@ -138,7 +140,7 @@
</span><span class="cx"> // to it with a local pointer here for a liitle longer, so that we can
</span><span class="cx"> // unschedule any DatabaseTasks that refer to it before the database gets
</span><span class="cx"> // deleted.
</span><del>- Ref<DatabaseBackend> protect(*this);
</del><ins>+ Ref<Database> protect(*this);
</ins><span class="cx"> databaseContext()->databaseThread()->recordDatabaseClosed(this);
</span><span class="cx"> databaseContext()->databaseThread()->unscheduleDatabaseTasks(this);
</span><span class="cx"> }
</span><span class="lines">@@ -223,16 +225,6 @@
</span><span class="cx"> return databaseContext()->databaseThread()->transactionCoordinator();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Database* Database::from(DatabaseBackend* backend)
-{
- return static_cast<Database*>(backend->m_frontend);
-}
-
-PassRefPtr<DatabaseBackend> Database::backend()
-{
- return this;
-}
-
</del><span class="cx"> String Database::version() const
</span><span class="cx"> {
</span><span class="cx"> if (m_deleted)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -29,9 +29,10 @@
</span><span class="cx"> #ifndef Database_h
</span><span class="cx"> #define Database_h
</span><span class="cx">
</span><del>-#include "DatabaseBackend.h"
</del><ins>+#include "DatabaseBackendBase.h"
</ins><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><ins>+#include <wtf/Deque.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -44,10 +45,12 @@
</span><span class="cx"> class SQLTransaction;
</span><span class="cx"> class SQLTransactionBackend;
</span><span class="cx"> class SQLTransactionCallback;
</span><ins>+class SQLTransactionClient;
+class SQLTransactionCoordinator;
</ins><span class="cx"> class SQLTransactionErrorCallback;
</span><span class="cx"> class VoidCallback;
</span><span class="cx">
</span><del>-class Database final : public DatabaseBackend {
</del><ins>+class Database final : public DatabaseBackendBase {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~Database();
</span><span class="cx">
</span><span class="lines">@@ -74,7 +77,6 @@
</span><span class="cx"> void readTransaction(PassRefPtr<SQLTransactionCallback>, PassRefPtr<SQLTransactionErrorCallback>, PassRefPtr<VoidCallback> successCallback);
</span><span class="cx">
</span><span class="cx"> // Internal engine support
</span><del>- static Database* from(DatabaseBackend*);
</del><span class="cx"> DatabaseContext* databaseContext() const { return m_databaseContext.get(); }
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() { return m_scriptExecutionContext.get(); }
</span><span class="lines">@@ -89,19 +91,22 @@
</span><span class="cx">
</span><span class="cx"> void scheduleTransactionCallback(SQLTransaction*);
</span><span class="cx">
</span><ins>+ virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
+ Vector<String> performGetTableNames();
+
</ins><span class="cx"> private:
</span><span class="cx"> Database(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
</span><span class="cx">
</span><del>- PassRefPtr<DatabaseBackend> backend();
</del><span class="cx"> static PassRefPtr<Database> create(ScriptExecutionContext*, PassRefPtr<DatabaseBackendBase>);
</span><span class="cx">
</span><del>- virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
-
</del><span class="cx"> void scheduleTransaction();
</span><span class="cx">
</span><span class="cx"> void runTransaction(RefPtr<SQLTransactionCallback>&&, RefPtr<SQLTransactionErrorCallback>&&, RefPtr<VoidCallback>&& successCallback, bool readOnly, const ChangeVersionData* = nullptr);
</span><span class="cx">
</span><del>- Vector<String> performGetTableNames();
</del><ins>+ Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
+ DeprecatedMutex m_transactionInProgressMutex;
+ bool m_transactionInProgress;
+ bool m_isTransactionQueueEnabled;
</ins><span class="cx">
</span><span class="cx"> RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
</span><span class="cx"> RefPtr<SecurityOrigin> m_databaseThreadSecurityOrigin;
</span><span class="lines">@@ -112,7 +117,6 @@
</span><span class="cx">
</span><span class="cx"> friend class DatabaseManager;
</span><span class="cx"> friend class DatabaseServer; // FIXME: remove this when the backend has been split out.
</span><del>- friend class DatabaseBackend; // FIXME: remove this when the backend has been split out.
</del><span class="cx"> friend class SQLStatement;
</span><span class="cx"> friend class SQLTransaction;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DatabaseBackend.h"
-
-#include "ChangeVersionData.h"
-#include "ChangeVersionWrapper.h"
-#include "Database.h"
-#include "DatabaseContext.h"
-#include "DatabaseTask.h"
-#include "DatabaseThread.h"
-#include "DatabaseTracker.h"
-#include "Logging.h"
-#include "SQLError.h"
-#include "SQLTransaction.h"
-#include "SQLTransactionBackend.h"
-#include "SQLTransactionCallback.h"
-#include "SQLTransactionClient.h"
-#include "SQLTransactionCoordinator.h"
-#include "SQLTransactionErrorCallback.h"
-#include "VoidCallback.h"
-
-namespace WebCore {
-
-DatabaseBackend::DatabaseBackend(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBackendBase(databaseContext, name, expectedVersion, displayName, estimatedSize)
- , m_transactionInProgress(false)
- , m_isTransactionQueueEnabled(true)
-{
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DatabaseBackend_h
-#define DatabaseBackend_h
-
-#include "DatabaseBackendBase.h"
-#include <wtf/Deque.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class ChangeVersionData;
-class Database;
-class DatabaseServer;
-class SQLTransaction;
-class SQLTransactionBackend;
-class SQLTransactionClient;
-class SQLTransactionCoordinator;
-
-// FIXME: This implementation of DatabaseBackend is only a place holder
-// for the split out of the Database backend to be done later. This
-// place holder is needed to allow other code that need to reference the
-// DatabaseBackend to do so before the proper backend split is
-// available. This should be replaced with the actual implementation later.
-
-class DatabaseBackend : public DatabaseBackendBase {
-public:
- DatabaseBackend(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
-
-private:
- class DatabaseOpenTask;
- class DatabaseCloseTask;
- class DatabaseTransactionTask;
- class DatabaseTableNamesTask;
-
- Deque<RefPtr<SQLTransactionBackend>> m_transactionQueue;
- DeprecatedMutex m_transactionInProgressMutex;
- bool m_transactionInProgress;
- bool m_isTransactionQueueEnabled;
-
- friend class Database;
-};
-
-} // namespace WebCore
-
-#endif // DatabaseBackend_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AbstractDatabaseServer.h"
</span><span class="cx"> #include "Database.h"
</span><del>-#include "DatabaseBackend.h"
</del><span class="cx"> #include "DatabaseBackendBase.h"
</span><span class="cx"> #include "DatabaseCallback.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "DatabaseServer.h"
</span><span class="cx">
</span><span class="cx"> #include "Database.h"
</span><del>-#include "DatabaseBackend.h"
</del><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseTracker.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "DatabaseTask.h"
</span><span class="cx">
</span><span class="cx"> #include "Database.h"
</span><del>-#include "DatabaseBackend.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -58,7 +57,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(Database& 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">@@ -98,7 +97,7 @@
</span><span class="cx"> // *** DatabaseOpenTask ***
</span><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& error, String& errorMessage, bool& success)
</del><ins>+DatabaseOpenTask::DatabaseOpenTask(Database& database, bool setVersionInNewDatabase, DatabaseTaskSynchronizer& synchronizer, DatabaseError& error, String& errorMessage, bool& success)
</ins><span class="cx"> : DatabaseTask(database, &synchronizer)
</span><span class="cx"> , m_setVersionInNewDatabase(setVersionInNewDatabase)
</span><span class="cx"> , m_error(error)
</span><span class="lines">@@ -107,7 +106,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseBackend::DatabaseOpenTask::doPerformTask()
</del><ins>+void DatabaseOpenTask::doPerformTask()
</ins><span class="cx"> {
</span><span class="cx"> String errorMessage;
</span><span class="cx"> m_success = database().performOpenAndVerify(m_setVersionInNewDatabase, m_error, errorMessage);
</span><span class="lines">@@ -116,7 +115,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-const char* DatabaseBackend::DatabaseOpenTask::debugTaskName() const
</del><ins>+const char* DatabaseOpenTask::debugTaskName() const
</ins><span class="cx"> {
</span><span class="cx"> return "DatabaseOpenTask";
</span><span class="cx"> }
</span><span class="lines">@@ -125,18 +124,18 @@
</span><span class="cx"> // *** DatabaseCloseTask ***
</span><span class="cx"> // Closes the database.
</span><span class="cx">
</span><del>-DatabaseBackend::DatabaseCloseTask::DatabaseCloseTask(DatabaseBackend& database, DatabaseTaskSynchronizer& synchronizer)
</del><ins>+DatabaseCloseTask::DatabaseCloseTask(Database& database, DatabaseTaskSynchronizer& synchronizer)
</ins><span class="cx"> : DatabaseTask(database, &synchronizer)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseBackend::DatabaseCloseTask::doPerformTask()
</del><ins>+void DatabaseCloseTask::doPerformTask()
</ins><span class="cx"> {
</span><del>- Database::from(&database())->close();
</del><ins>+ database().close();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-const char* DatabaseBackend::DatabaseCloseTask::debugTaskName() const
</del><ins>+const char* DatabaseCloseTask::debugTaskName() const
</ins><span class="cx"> {
</span><span class="cx"> return "DatabaseCloseTask";
</span><span class="cx"> }
</span><span class="lines">@@ -145,14 +144,14 @@
</span><span class="cx"> // *** DatabaseTransactionTask ***
</span><span class="cx"> // Starts a transaction that will report its results via a callback.
</span><span class="cx">
</span><del>-DatabaseBackend::DatabaseTransactionTask::DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend> transaction)
- : DatabaseTask(*Database::from(transaction->database()), 0)
</del><ins>+DatabaseTransactionTask::DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend> transaction)
+ : DatabaseTask(*transaction->database(), 0)
</ins><span class="cx"> , m_transaction(transaction)
</span><span class="cx"> , m_didPerformTask(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DatabaseBackend::DatabaseTransactionTask::~DatabaseTransactionTask()
</del><ins>+DatabaseTransactionTask::~DatabaseTransactionTask()
</ins><span class="cx"> {
</span><span class="cx"> // If the task is being destructed without the transaction ever being run,
</span><span class="cx"> // then we must either have an error or an interruption. Give the
</span><span class="lines">@@ -166,14 +165,14 @@
</span><span class="cx"> m_transaction->notifyDatabaseThreadIsShuttingDown();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseBackend::DatabaseTransactionTask::doPerformTask()
</del><ins>+void DatabaseTransactionTask::doPerformTask()
</ins><span class="cx"> {
</span><span class="cx"> m_transaction->performNextStep();
</span><span class="cx"> m_didPerformTask = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-const char* DatabaseBackend::DatabaseTransactionTask::debugTaskName() const
</del><ins>+const char* DatabaseTransactionTask::debugTaskName() const
</ins><span class="cx"> {
</span><span class="cx"> return "DatabaseTransactionTask";
</span><span class="cx"> }
</span><span class="lines">@@ -182,19 +181,19 @@
</span><span class="cx"> // *** DatabaseTableNamesTask ***
</span><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<String>& names)
</del><ins>+DatabaseTableNamesTask::DatabaseTableNamesTask(Database& database, DatabaseTaskSynchronizer& synchronizer, Vector<String>& names)
</ins><span class="cx"> : DatabaseTask(database, &synchronizer)
</span><span class="cx"> , m_tableNames(names)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseBackend::DatabaseTableNamesTask::doPerformTask()
</del><ins>+void DatabaseTableNamesTask::doPerformTask()
</ins><span class="cx"> {
</span><del>- m_tableNames = Database::from(&database())->performGetTableNames();
</del><ins>+ m_tableNames = database().performGetTableNames();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>-const char* DatabaseBackend::DatabaseTableNamesTask::debugTaskName() const
</del><ins>+const char* DatabaseTableNamesTask::debugTaskName() const
</ins><span class="cx"> {
</span><span class="cx"> return "DatabaseTableNamesTask";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTask.h 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #ifndef DatabaseTask_h
</span><span class="cx"> #define DatabaseTask_h
</span><span class="cx">
</span><del>-#include "DatabaseBackend.h"
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="cx"> #include "SQLTransactionBackend.h"
</span><span class="lines">@@ -73,19 +72,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>+ Database& 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->hasCheckedForTermination(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- DatabaseTask(DatabaseBackend&, DatabaseTaskSynchronizer*);
</del><ins>+ DatabaseTask(Database&, 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>+ Database& m_database;
</ins><span class="cx"> DatabaseTaskSynchronizer* m_synchronizer;
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="lines">@@ -94,9 +93,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class DatabaseBackend::DatabaseOpenTask : public DatabaseTask {
</del><ins>+class DatabaseOpenTask : public DatabaseTask {
</ins><span class="cx"> public:
</span><del>- DatabaseOpenTask(DatabaseBackend&, bool setVersionInNewDatabase, DatabaseTaskSynchronizer&, DatabaseError&, String& errorMessage, bool& success);
</del><ins>+ DatabaseOpenTask(Database&, bool setVersionInNewDatabase, DatabaseTaskSynchronizer&, DatabaseError&, String& errorMessage, bool& success);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void doPerformTask() override;
</span><span class="lines">@@ -110,9 +109,9 @@
</span><span class="cx"> bool& m_success;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class DatabaseBackend::DatabaseCloseTask : public DatabaseTask {
</del><ins>+class DatabaseCloseTask : public DatabaseTask {
</ins><span class="cx"> public:
</span><del>- DatabaseCloseTask(DatabaseBackend&, DatabaseTaskSynchronizer&);
</del><ins>+ DatabaseCloseTask(Database&, DatabaseTaskSynchronizer&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void doPerformTask() override;
</span><span class="lines">@@ -121,7 +120,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class DatabaseBackend::DatabaseTransactionTask : public DatabaseTask {
</del><ins>+class DatabaseTransactionTask : public DatabaseTask {
</ins><span class="cx"> public:
</span><span class="cx"> explicit DatabaseTransactionTask(PassRefPtr<SQLTransactionBackend>);
</span><span class="cx"> virtual ~DatabaseTransactionTask();
</span><span class="lines">@@ -138,9 +137,9 @@
</span><span class="cx"> bool m_didPerformTask;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class DatabaseBackend::DatabaseTableNamesTask : public DatabaseTask {
</del><ins>+class DatabaseTableNamesTask : public DatabaseTask {
</ins><span class="cx"> public:
</span><del>- DatabaseTableNamesTask(DatabaseBackend&, DatabaseTaskSynchronizer&, Vector<String>& names);
</del><ins>+ DatabaseTableNamesTask(Database&, DatabaseTaskSynchronizer&, Vector<String>& names);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void doPerformTask() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLStatementBackend.h"
</span><span class="cx">
</span><del>-#include "DatabaseBackend.h"
</del><ins>+#include "Database.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "SQLError.h"
</span><span class="cx"> #include "SQLResultSet.h"
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> return m_resultSet;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SQLStatementBackend::execute(DatabaseBackend& db)
</del><ins>+bool SQLStatementBackend::execute(Database& db)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_resultSet);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DatabaseBackend;
</del><ins>+class Database;
</ins><span class="cx"> class SQLError;
</span><span class="cx"> class SQLResultSet;
</span><span class="cx"> class SQLStatement;
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> const String& sqlStatement, const Vector<SQLValue>& arguments, int permissions);
</span><span class="cx"> virtual ~SQLStatementBackend();
</span><span class="cx">
</span><del>- bool execute(DatabaseBackend&);
</del><ins>+ bool execute(Database&);
</ins><span class="cx"> bool lastExecutionFailedDueToQuota() const;
</span><span class="cx">
</span><span class="cx"> bool hasStatementCallback() const { return m_hasCallback; }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -29,9 +29,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SQLTransactionBackend.h"
</span><span class="cx">
</span><del>-#include "Database.h" // FIXME: Should only be used in the frontend.
</del><ins>+#include "Database.h"
</ins><span class="cx"> #include "DatabaseAuthorizer.h"
</span><del>-#include "DatabaseBackend.h"
</del><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseThread.h"
</span><span class="cx"> #include "DatabaseTracker.h"
</span><span class="lines">@@ -529,7 +528,7 @@
</span><span class="cx"> RefPtr<SQLStatementBackend> statementBackend;
</span><span class="cx"> statementBackend = SQLStatementBackend::create(WTF::move(statement), sqlStatement, arguments, permissions);
</span><span class="cx">
</span><del>- if (Database::from(m_database.get())->deleted())
</del><ins>+ if (m_database->deleted())
</ins><span class="cx"> statementBackend->setDatabaseDeletedError();
</span><span class="cx">
</span><span class="cx"> enqueueStatementBackend(statementBackend);
</span><span class="lines">@@ -567,7 +566,7 @@
</span><span class="cx"> LOG(StorageAPI, "Opening and preflighting transaction %p", this);
</span><span class="cx">
</span><span class="cx"> // If the database was deleted, jump to the error callback
</span><del>- if (Database::from(m_database.get())->deleted()) {
</del><ins>+ if (m_database->deleted()) {
</ins><span class="cx"> m_transactionError = SQLError::create(SQLError::UNKNOWN_ERR, "unable to open a transaction, because the user deleted the database");
</span><span class="cx"> return nextStateForTransactionError();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -6808,7 +6808,6 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\Database.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp" />
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp" />
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseContext.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseManager.cpp" />
</span><span class="lines">@@ -20548,7 +20547,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\ChangeVersionWrapper.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\Database.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h" />
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h" />
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBasicTypes.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseCallback.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -483,9 +483,6 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7448,9 +7445,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (187973 => 187974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-05 19:21:25 UTC (rev 187973)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-05 19:31:35 UTC (rev 187974)
</span><span class="lines">@@ -6818,8 +6818,6 @@
</span><span class="cx"> FE0D84E910484348001A179E /* WebEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = FE0D84E810484348001A179E /* WebEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE0D84EB1048436E001A179E /* WebEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = FE0D84EA1048436E001A179E /* WebEvent.mm */; };
</span><span class="cx"> FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */ = {isa = PBXBuildFile; fileRef = FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */; };
- FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */ = {isa = PBXBuildFile; fileRef = FE36FD1116C7826400F887C1 /* ChangeVersionData.h */; };
</span><span class="cx"> FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */; };
</span><span class="lines">@@ -14585,8 +14583,6 @@
</span><span class="cx"> FE0D84E810484348001A179E /* WebEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> FE0D84EA1048436E001A179E /* WebEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEvent.mm; sourceTree = "<group>"; };
</span><span class="cx"> FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractDatabaseServer.h; sourceTree = "<group>"; };
</span><del>- FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBackend.cpp; sourceTree = "<group>"; };
- FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBackend.h; sourceTree = "<group>"; };
</del><span class="cx"> FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBasicTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> FE36FD1116C7826400F887C1 /* ChangeVersionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeVersionData.h; sourceTree = "<group>"; };
</span><span class="cx"> FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionStateMachine.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -18783,8 +18779,6 @@
</span><span class="cx"> 97BC69E01505F081001B74AC /* Database.idl */,
</span><span class="cx"> 97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */,
</span><span class="cx"> 97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */,
</span><del>- FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */,
- FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */,
</del><span class="cx"> 97BC69D61505F076001B74AC /* DatabaseBackendBase.cpp */,
</span><span class="cx"> 97BC69D71505F076001B74AC /* DatabaseBackendBase.h */,
</span><span class="cx"> FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */,
</span><span class="lines">@@ -24366,7 +24360,6 @@
</span><span class="cx"> 26F756B01B3B65AC0005DD79 /* MutableRange.h in Headers */,
</span><span class="cx"> 97BC6A211505F081001B74AC /* Database.h in Headers */,
</span><span class="cx"> 97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */,
</span><del>- FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */,
</del><span class="cx"> 97BC69DB1505F076001B74AC /* DatabaseBackendBase.h in Headers */,
</span><span class="cx"> FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */,
</span><span class="cx"> 97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */,
</span><span class="lines">@@ -28124,7 +28117,6 @@
</span><span class="cx"> 62CD32591157E57C0063B0A7 /* CustomEvent.cpp in Sources */,
</span><span class="cx"> 97BC6A201505F081001B74AC /* Database.cpp in Sources */,
</span><span class="cx"> 97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */,
</span><del>- FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */,
</del><span class="cx"> 97BC69DA1505F076001B74AC /* DatabaseBackendBase.cpp in Sources */,
</span><span class="cx"> 97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */,
</span><span class="cx"> FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>