<!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>[188066] 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/188066">188066</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-06 15:32:06 -0700 (Thu, 06 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>SQLStatementBackend doesn't need to be refcounted
https://bugs.webkit.org/show_bug.cgi?id=147748
Reviewed by Geoffrey Garen.
There's no shared ownership of SQLStatementBackend so we can just use std::unique_ptr.
* Modules/webdatabase/SQLStatementBackend.cpp:
(WebCore::SQLStatementBackend::create): Deleted.
* Modules/webdatabase/SQLStatementBackend.h:
* Modules/webdatabase/SQLTransactionBackend.cpp:
(WebCore::SQLTransactionBackend::enqueueStatementBackend):
(WebCore::SQLTransactionBackend::executeSQL):
* Modules/webdatabase/SQLTransactionBackend.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188065 => 188066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-06 22:23:31 UTC (rev 188065)
+++ trunk/Source/WebCore/ChangeLog 2015-08-06 22:32:06 UTC (rev 188066)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-06 Anders Carlsson <andersca@apple.com>
+
+ SQLStatementBackend doesn't need to be refcounted
+ https://bugs.webkit.org/show_bug.cgi?id=147748
+
+ Reviewed by Geoffrey Garen.
+
+ There's no shared ownership of SQLStatementBackend so we can just use std::unique_ptr.
+
+ * Modules/webdatabase/SQLStatementBackend.cpp:
+ (WebCore::SQLStatementBackend::create): Deleted.
+ * Modules/webdatabase/SQLStatementBackend.h:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::enqueueStatementBackend):
+ (WebCore::SQLTransactionBackend::executeSQL):
+ * Modules/webdatabase/SQLTransactionBackend.h:
+
</ins><span class="cx"> 2015-08-06 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not enforce "content-disposition: attachment" sandbox restrictions on a MediaDocument
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp (188065 => 188066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-06 22:23:31 UTC (rev 188065)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-06 22:32:06 UTC (rev 188066)
</span><span class="lines">@@ -75,12 +75,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<SQLStatementBackend> SQLStatementBackend::create(std::unique_ptr<SQLStatement> frontend,
- const String& statement, const Vector<SQLValue>& arguments, int permissions)
-{
- return adoptRef(*new SQLStatementBackend(WTF::move(frontend), statement, arguments, permissions));
-}
-
</del><span class="cx"> SQLStatementBackend::SQLStatementBackend(std::unique_ptr<SQLStatement> frontend,
</span><span class="cx"> const String& statement, const Vector<SQLValue>& arguments, int permissions)
</span><span class="cx"> : m_frontend(WTF::move(frontend))
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h (188065 => 188066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-06 22:23:31 UTC (rev 188065)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-06 22:32:06 UTC (rev 188066)
</span><span class="lines">@@ -41,11 +41,10 @@
</span><span class="cx"> class SQLStatement;
</span><span class="cx"> class SQLTransactionBackend;
</span><span class="cx">
</span><del>-class SQLStatementBackend : public ThreadSafeRefCounted<SQLStatementBackend> {
</del><ins>+class SQLStatementBackend {
</ins><span class="cx"> public:
</span><del>- static Ref<SQLStatementBackend> create(std::unique_ptr<SQLStatement>,
- const String& sqlStatement, const Vector<SQLValue>& arguments, int permissions);
- virtual ~SQLStatementBackend();
</del><ins>+ SQLStatementBackend(std::unique_ptr<SQLStatement>, const String& statement, const Vector<SQLValue>& arguments, int permissions);
+ ~SQLStatementBackend();
</ins><span class="cx">
</span><span class="cx"> bool execute(Database&);
</span><span class="cx"> bool lastExecutionFailedDueToQuota() const;
</span><span class="lines">@@ -61,9 +60,6 @@
</span><span class="cx"> PassRefPtr<SQLResultSet> sqlResultSet() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SQLStatementBackend(std::unique_ptr<SQLStatement>, const String& statement,
- const Vector<SQLValue>& arguments, int permissions);
-
</del><span class="cx"> void setFailureDueToQuota();
</span><span class="cx"> void clearFailureDueToQuota();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (188065 => 188066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-06 22:23:31 UTC (rev 188065)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-06 22:32:06 UTC (rev 188066)
</span><span class="lines">@@ -463,10 +463,10 @@
</span><span class="cx"> return stateFunctions[static_cast<int>(state)];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SQLTransactionBackend::enqueueStatementBackend(PassRefPtr<SQLStatementBackend> statementBackend)
</del><ins>+void SQLTransactionBackend::enqueueStatementBackend(std::unique_ptr<SQLStatementBackend> statementBackend)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_statementMutex);
</span><del>- m_statementQueue.append(statementBackend);
</del><ins>+ m_statementQueue.append(WTF::move(statementBackend));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::computeNextStateAndCleanupIfNeeded()
</span><span class="lines">@@ -525,13 +525,12 @@
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::executeSQL(std::unique_ptr<SQLStatement> statement, const String& sqlStatement, const Vector<SQLValue>& arguments, int permissions)
</span><span class="cx"> {
</span><del>- RefPtr<SQLStatementBackend> statementBackend;
- statementBackend = SQLStatementBackend::create(WTF::move(statement), sqlStatement, arguments, permissions);
</del><ins>+ auto statementBackend = std::make_unique<SQLStatementBackend>(WTF::move(statement), sqlStatement, arguments, permissions);
</ins><span class="cx">
</span><span class="cx"> if (m_database->deleted())
</span><span class="cx"> statementBackend->setDatabaseDeletedError();
</span><span class="cx">
</span><del>- enqueueStatementBackend(statementBackend);
</del><ins>+ enqueueStatementBackend(WTF::move(statementBackend));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransactionBackend::notifyDatabaseThreadIsShuttingDown()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (188065 => 188066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-08-06 22:23:31 UTC (rev 188065)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-08-06 22:32:06 UTC (rev 188066)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> void doCleanup();
</span><span class="cx">
</span><del>- void enqueueStatementBackend(PassRefPtr<SQLStatementBackend>);
</del><ins>+ void enqueueStatementBackend(std::unique_ptr<SQLStatementBackend>);
</ins><span class="cx">
</span><span class="cx"> // State Machine functions:
</span><span class="cx"> virtual StateFunction stateFunctionFor(SQLTransactionState) override;
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> void releaseOriginLockIfNeeded();
</span><span class="cx">
</span><span class="cx"> RefPtr<SQLTransaction> m_frontend; // Has a reference cycle, and will break in doCleanup().
</span><del>- RefPtr<SQLStatementBackend> m_currentStatementBackend;
</del><ins>+ std::unique_ptr<SQLStatementBackend> m_currentStatementBackend;
</ins><span class="cx">
</span><span class="cx"> RefPtr<Database> m_database;
</span><span class="cx"> RefPtr<SQLTransactionWrapper> m_wrapper;
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> bool m_hasVersionMismatch;
</span><span class="cx">
</span><span class="cx"> Mutex m_statementMutex;
</span><del>- Deque<RefPtr<SQLStatementBackend>> m_statementQueue;
</del><ins>+ Deque<std::unique_ptr<SQLStatementBackend>> m_statementQueue;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<SQLiteTransaction> m_sqliteTransaction;
</span><span class="cx"> RefPtr<OriginLock> m_originLock;
</span></span></pre>
</div>
</div>
</body>
</html>