<!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>[187993] 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/187993">187993</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 15:33:34 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more dead database code
https://bugs.webkit.org/show_bug.cgi?id=147698
Reviewed by Tim Horton.
* Modules/webdatabase/DatabaseBackendBase.cpp:
(WebCore::DatabaseBackendBase::interrupt): Deleted.
(WebCore::DatabaseBackendBase::isInterrupted): Deleted.
* Modules/webdatabase/DatabaseBackendBase.h:
* Modules/webdatabase/SQLStatementBackend.cpp:
(WebCore::SQLStatementBackend::execute):
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::computeNextStateAndCleanupIfNeeded):
* Modules/webdatabase/SQLTransactionBackend.cpp:
(WebCore::SQLTransactionBackend::computeNextStateAndCleanupIfNeeded):
* platform/sql/SQLiteDatabase.cpp:
(WebCore::SQLiteDatabase::setFullsync):
(WebCore::SQLiteDatabase::SQLiteDatabase): Deleted.
(WebCore::SQLiteDatabase::interrupt): Deleted.
(WebCore::SQLiteDatabase::isInterrupted): Deleted.
* platform/sql/SQLiteDatabase.h:
* platform/sql/SQLiteStatement.cpp:
(WebCore::SQLiteStatement::prepare): Deleted.
(WebCore::SQLiteStatement::step): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendcpp">trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteDatabasecpp">trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteDatabaseh">trunk/Source/WebCore/platform/sql/SQLiteDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteStatementcpp">trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-08-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove more dead database code
+ https://bugs.webkit.org/show_bug.cgi?id=147698
+
+ Reviewed by Tim Horton.
+
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ (WebCore::DatabaseBackendBase::interrupt): Deleted.
+ (WebCore::DatabaseBackendBase::isInterrupted): Deleted.
+ * Modules/webdatabase/DatabaseBackendBase.h:
+ * Modules/webdatabase/SQLStatementBackend.cpp:
+ (WebCore::SQLStatementBackend::execute):
+ * Modules/webdatabase/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::computeNextStateAndCleanupIfNeeded):
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::computeNextStateAndCleanupIfNeeded):
+ * platform/sql/SQLiteDatabase.cpp:
+ (WebCore::SQLiteDatabase::setFullsync):
+ (WebCore::SQLiteDatabase::SQLiteDatabase): Deleted.
+ (WebCore::SQLiteDatabase::interrupt): Deleted.
+ (WebCore::SQLiteDatabase::isInterrupted): Deleted.
+ * platform/sql/SQLiteDatabase.h:
+ * platform/sql/SQLiteStatement.cpp:
+ (WebCore::SQLiteStatement::prepare): Deleted.
+ (WebCore::SQLiteStatement::step): Deleted.
+
+2015-08-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Fix build.
</span><span class="cx">
</span><span class="cx"> * platform/cf/CoreMediaSoftLink.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -586,15 +586,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseBackendBase::interrupt()
-{
- m_sqliteDatabase.interrupt();
-}
-
-bool DatabaseBackendBase::isInterrupted()
-{
- DeprecatedMutexLocker locker(m_sqliteDatabase.databaseMutex());
- return m_sqliteDatabase.isInterrupted();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -65,8 +65,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned long long maximumSize() const;
</span><span class="cx"> void incrementalVacuumIfNeeded();
</span><del>- void interrupt();
- bool isInterrupted();
</del><span class="cx">
</span><span class="cx"> void disableAuthorizer();
</span><span class="cx"> void enableAuthorizer();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> // If this is the case, they might be trying to do something fishy or malicious
</span><span class="cx"> if (statement.bindParameterCount() != m_arguments.size()) {
</span><span class="cx"> LOG(StorageAPI, "Bind parameter count doesn't match number of question marks");
</span><del>- m_error = SQLError::create(db.isInterrupted() ? SQLError::DATABASE_ERR : SQLError::SYNTAX_ERR, "number of '?'s in statement string does not match argument count");
</del><ins>+ m_error = SQLError::create(SQLError::SYNTAX_ERR, "number of '?'s in statement string does not match argument count");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Only honor the requested state transition if we're not supposed to be
</span><span class="cx"> // cleaning up and shutting down:
</span><del>- if (m_database->opened() && !m_database->isInterrupted()) {
</del><ins>+ if (m_database->opened()) {
</ins><span class="cx"> setStateToRequestedState();
</span><span class="cx"> ASSERT(m_nextState == SQLTransactionState::End
</span><span class="cx"> || m_nextState == SQLTransactionState::DeliverTransactionCallback
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Only honor the requested state transition if we're not supposed to be
</span><span class="cx"> // cleaning up and shutting down:
</span><del>- if (m_database->opened() && !m_database->isInterrupted()) {
</del><ins>+ if (m_database->opened()) {
</ins><span class="cx"> setStateToRequestedState();
</span><span class="cx"> ASSERT(m_nextState == SQLTransactionState::AcquireLock
</span><span class="cx"> || m_nextState == SQLTransactionState::OpenTransactionAndPreflight
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> , m_transactionInProgress(false)
</span><span class="cx"> , m_sharable(false)
</span><span class="cx"> , m_openingThread(0)
</span><del>- , m_interrupted(false)
</del><span class="cx"> , m_openError(SQLITE_ERROR)
</span><span class="cx"> , m_openErrorMessage()
</span><span class="cx"> , m_lastChangesCount(0)
</span><span class="lines">@@ -148,28 +147,8 @@
</span><span class="cx"> sqlite3_create_function(m_db, functionParameter.first, functionParameter.second, SQLITE_UTF8, const_cast<char*>(functionParameter.first), unauthorizedSQLFunction, 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SQLiteDatabase::interrupt()
</del><ins>+void SQLiteDatabase::setFullsync(bool fsync)
</ins><span class="cx"> {
</span><del>- m_interrupted = true;
- while (!m_lockingMutex.tryLock()) {
- DeprecatedMutexLocker locker(m_databaseClosingMutex);
- if (!m_db)
- return;
- sqlite3_interrupt(m_db);
- std::this_thread::yield();
- }
-
- m_lockingMutex.unlock();
-}
-
-bool SQLiteDatabase::isInterrupted()
-{
- ASSERT(!m_lockingMutex.tryLock());
- return m_interrupted;
-}
-
-void SQLiteDatabase::setFullsync(bool fsync)
-{
</del><span class="cx"> if (fsync)
</span><span class="cx"> executeCommand(ASCIILiteral("PRAGMA fullfsync = 1;"));
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.h (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.h 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.h 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx"> WEBCORE_EXPORT bool open(const String& filename, bool forWebSQLDatabase = false);
</span><span class="cx"> bool isOpen() const { return m_db; }
</span><span class="cx"> WEBCORE_EXPORT void close();
</span><del>- void interrupt();
- bool isInterrupted();
</del><span class="cx">
</span><span class="cx"> void updateLastChangesCount();
</span><span class="cx">
</span><span class="lines">@@ -156,7 +154,6 @@
</span><span class="cx"> ThreadIdentifier m_openingThread;
</span><span class="cx">
</span><span class="cx"> DeprecatedMutex m_databaseClosingMutex;
</span><del>- bool m_interrupted;
</del><span class="cx">
</span><span class="cx"> int m_openError;
</span><span class="cx"> CString m_openErrorMessage;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteStatementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp (187992 => 187993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-08-05 22:20:06 UTC (rev 187992)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-08-05 22:33:34 UTC (rev 187993)
</span><span class="lines">@@ -60,8 +60,6 @@
</span><span class="cx"> ASSERT(!m_isPrepared);
</span><span class="cx">
</span><span class="cx"> DeprecatedMutexLocker databaseLock(m_database.databaseMutex());
</span><del>- if (m_database.isInterrupted())
- return SQLITE_INTERRUPT;
</del><span class="cx">
</span><span class="cx"> CString query = m_query.stripWhiteSpace().utf8();
</span><span class="cx">
</span><span class="lines">@@ -89,8 +87,6 @@
</span><span class="cx"> int SQLiteStatement::step()
</span><span class="cx"> {
</span><span class="cx"> DeprecatedMutexLocker databaseLock(m_database.databaseMutex());
</span><del>- if (m_database.isInterrupted())
- return SQLITE_INTERRUPT;
</del><span class="cx">
</span><span class="cx"> if (!m_statement)
</span><span class="cx"> return SQLITE_OK;
</span></span></pre>
</div>
</div>
</body>
</html>