<!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>[177873] 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/177873">177873</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-04 10:57:44 -0800 (Sun, 04 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modernize parts of the database code
https://bugs.webkit.org/show_bug.cgi?id=140054

Reviewed by Antti Koivisto.

* Modules/webdatabase/Database.cpp:
(WebCore::Database::runTransaction):
* Modules/webdatabase/Database.h:
* Modules/webdatabase/SQLStatement.cpp:
(WebCore::SQLStatement::SQLStatement):
* Modules/webdatabase/SQLStatement.h:
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::create):
(WebCore::SQLTransaction::SQLTransaction):
(WebCore::SQLTransaction::deliverQuotaIncreaseCallback):
(WebCore::SQLTransaction::executeSQL):
* Modules/webdatabase/SQLTransaction.h:
(WebCore::SQLTransaction::database):</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="#trunkSourceWebCoreModuleswebdatabaseDatabaseh">trunk/Source/WebCore/Modules/webdatabase/Database.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementcpp">trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementh">trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionh">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177872 => 177873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-04 06:35:04 UTC (rev 177872)
+++ trunk/Source/WebCore/ChangeLog        2015-01-04 18:57:44 UTC (rev 177873)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-04  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Modernize parts of the database code
+        https://bugs.webkit.org/show_bug.cgi?id=140054
+
+        Reviewed by Antti Koivisto.
+
+        * Modules/webdatabase/Database.cpp:
+        (WebCore::Database::runTransaction):
+        * Modules/webdatabase/Database.h:
+        * Modules/webdatabase/SQLStatement.cpp:
+        (WebCore::SQLStatement::SQLStatement):
+        * Modules/webdatabase/SQLStatement.h:
+        * Modules/webdatabase/SQLTransaction.cpp:
+        (WebCore::SQLTransaction::create):
+        (WebCore::SQLTransaction::SQLTransaction):
+        (WebCore::SQLTransaction::deliverQuotaIncreaseCallback):
+        (WebCore::SQLTransaction::executeSQL):
+        * Modules/webdatabase/SQLTransaction.h:
+        (WebCore::SQLTransaction::database):
+
</ins><span class="cx"> 2015-01-03  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Move the CSS Grid properties to the new StyleBuilder
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (177872 => 177873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp        2015-01-04 06:35:04 UTC (rev 177872)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp        2015-01-04 18:57:44 UTC (rev 177873)
</span><span class="lines">@@ -162,17 +162,17 @@
</span><span class="cx">     runTransaction(callback, errorCallback, successCallback, true);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Database::runTransaction(PassRefPtr&lt;SQLTransactionCallback&gt; callback, PassRefPtr&lt;SQLTransactionErrorCallback&gt; errorCallback,
-    PassRefPtr&lt;VoidCallback&gt; successCallback, bool readOnly, const ChangeVersionData* changeVersionData)
</del><ins>+void Database::runTransaction(RefPtr&lt;SQLTransactionCallback&gt;&amp;&amp; callback, RefPtr&lt;SQLTransactionErrorCallback&gt;&amp;&amp; errorCallback, RefPtr&lt;VoidCallback&gt;&amp;&amp; successCallback, bool readOnly, const ChangeVersionData* changeVersionData)
</ins><span class="cx"> {
</span><del>-    RefPtr&lt;SQLTransactionErrorCallback&gt; errorCallbackProtector(errorCallback);
-    RefPtr&lt;SQLTransaction&gt; transaction = SQLTransaction::create(this, callback, successCallback, errorCallbackProtector, readOnly);
</del><ins>+    RefPtr&lt;SQLTransaction&gt; transaction = SQLTransaction::create(*this, WTF::move(callback), WTF::move(successCallback), errorCallback.copyRef(), readOnly);
</ins><span class="cx"> 
</span><del>-    RefPtr&lt;SQLTransactionBackend&gt; transactionBackend(backend()-&gt;runTransaction(transaction.release(), readOnly, changeVersionData));
-    if (!transactionBackend &amp;&amp; errorCallbackProtector)
-        scriptExecutionContext()-&gt;postTask([errorCallbackProtector] (ScriptExecutionContext&amp;) {
</del><ins>+    RefPtr&lt;SQLTransactionBackend&gt; transactionBackend = backend()-&gt;runTransaction(transaction.release(), readOnly, changeVersionData);
+    if (!transactionBackend &amp;&amp; errorCallback) {
+        WTF::RefPtr&lt;SQLTransactionErrorCallback&gt; errorCallbackProtector = WTF::move(errorCallback);
+        scriptExecutionContext()-&gt;postTask([errorCallbackProtector](ScriptExecutionContext&amp;) {
</ins><span class="cx">             errorCallbackProtector-&gt;handleEvent(SQLError::create(SQLError::UNKNOWN_ERR, &quot;database has been closed&quot;).get());
</span><span class="cx">         });
</span><ins>+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Database::scheduleTransactionCallback(SQLTransaction* transaction)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (177872 => 177873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h        2015-01-04 06:35:04 UTC (rev 177872)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h        2015-01-04 18:57:44 UTC (rev 177873)
</span><span class="lines">@@ -76,13 +76,12 @@
</span><span class="cx">     void scheduleTransactionCallback(SQLTransaction*);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    Database(PassRefPtr&lt;DatabaseBackendContext&gt;, const String&amp; name,
-        const String&amp; expectedVersion, const String&amp; displayName, unsigned long estimatedSize);
</del><ins>+    Database(PassRefPtr&lt;DatabaseBackendContext&gt;, const String&amp; name, const String&amp; expectedVersion, const String&amp; displayName, unsigned long estimatedSize);
+
</ins><span class="cx">     PassRefPtr&lt;DatabaseBackend&gt; backend();
</span><span class="cx">     static PassRefPtr&lt;Database&gt; create(ScriptExecutionContext*, PassRefPtr&lt;DatabaseBackendBase&gt;);
</span><span class="cx"> 
</span><del>-    void runTransaction(PassRefPtr&lt;SQLTransactionCallback&gt;, PassRefPtr&lt;SQLTransactionErrorCallback&gt;,
-        PassRefPtr&lt;VoidCallback&gt; successCallback, bool readOnly, const ChangeVersionData* = 0);
</del><ins>+    void runTransaction(RefPtr&lt;SQLTransactionCallback&gt;&amp;&amp;, RefPtr&lt;SQLTransactionErrorCallback&gt;&amp;&amp;, RefPtr&lt;VoidCallback&gt;&amp;&amp; successCallback, bool readOnly, const ChangeVersionData* = nullptr);
</ins><span class="cx"> 
</span><span class="cx">     Vector&lt;String&gt; performGetTableNames();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp (177872 => 177873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp        2015-01-04 06:35:04 UTC (rev 177872)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp        2015-01-04 18:57:44 UTC (rev 177873)
</span><span class="lines">@@ -45,10 +45,9 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-SQLStatement::SQLStatement(Database* database, PassRefPtr&lt;SQLStatementCallback&gt; callback,
-    PassRefPtr&lt;SQLStatementErrorCallback&gt; errorCallback)
-    : m_statementCallbackWrapper(callback, database-&gt;scriptExecutionContext())
-    , m_statementErrorCallbackWrapper(errorCallback, database-&gt;scriptExecutionContext())
</del><ins>+SQLStatement::SQLStatement(Database&amp; database, PassRefPtr&lt;SQLStatementCallback&gt; callback, PassRefPtr&lt;SQLStatementErrorCallback&gt; errorCallback)
+    : m_statementCallbackWrapper(callback, database.scriptExecutionContext())
+    , m_statementErrorCallbackWrapper(errorCallback, database.scriptExecutionContext())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h (177872 => 177873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h        2015-01-04 06:35:04 UTC (rev 177872)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h        2015-01-04 18:57:44 UTC (rev 177873)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> 
</span><span class="cx"> class SQLStatement : public AbstractSQLStatement {
</span><span class="cx"> public:
</span><del>-    SQLStatement(Database*, PassRefPtr&lt;SQLStatementCallback&gt;, PassRefPtr&lt;SQLStatementErrorCallback&gt;);
</del><ins>+    SQLStatement(Database&amp;, PassRefPtr&lt;SQLStatementCallback&gt;, PassRefPtr&lt;SQLStatementErrorCallback&gt;);
</ins><span class="cx"> 
</span><span class="cx">     bool performCallback(SQLTransaction*);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (177872 => 177873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp        2015-01-04 06:35:04 UTC (rev 177872)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp        2015-01-04 18:57:44 UTC (rev 177873)
</span><span class="lines">@@ -49,24 +49,19 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-PassRefPtr&lt;SQLTransaction&gt; SQLTransaction::create(Database* db, PassRefPtr&lt;SQLTransactionCallback&gt; callback,
-    PassRefPtr&lt;VoidCallback&gt; successCallback, PassRefPtr&lt;SQLTransactionErrorCallback&gt; errorCallback,
-    bool readOnly)
</del><ins>+Ref&lt;SQLTransaction&gt; SQLTransaction::create(Ref&lt;Database&gt;&amp;&amp; database, RefPtr&lt;SQLTransactionCallback&gt;&amp;&amp; callback, RefPtr&lt;VoidCallback&gt;&amp;&amp; successCallback, RefPtr&lt;SQLTransactionErrorCallback&gt;&amp;&amp; errorCallback, bool readOnly)
</ins><span class="cx"> {
</span><del>-    return adoptRef(new SQLTransaction(db, callback, successCallback, errorCallback, readOnly));
</del><ins>+    return adoptRef(*new SQLTransaction(WTF::move(database), WTF::move(callback), WTF::move(successCallback), WTF::move(errorCallback), readOnly));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-SQLTransaction::SQLTransaction(Database* db, PassRefPtr&lt;SQLTransactionCallback&gt; callback,
-    PassRefPtr&lt;VoidCallback&gt; successCallback, PassRefPtr&lt;SQLTransactionErrorCallback&gt; errorCallback,
-    bool readOnly)
-    : m_database(db)
-    , m_callbackWrapper(callback, db-&gt;scriptExecutionContext())
-    , m_successCallbackWrapper(successCallback, db-&gt;scriptExecutionContext())
-    , m_errorCallbackWrapper(errorCallback, db-&gt;scriptExecutionContext())
</del><ins>+SQLTransaction::SQLTransaction(Ref&lt;Database&gt;&amp;&amp; database, RefPtr&lt;SQLTransactionCallback&gt;&amp;&amp; callback, RefPtr&lt;VoidCallback&gt;&amp;&amp; successCallback, RefPtr&lt;SQLTransactionErrorCallback&gt;&amp;&amp; errorCallback, bool readOnly)
+    : m_database(WTF::move(database))
+    , m_callbackWrapper(WTF::move(callback), m_database-&gt;scriptExecutionContext())
+    , m_successCallbackWrapper(WTF::move(successCallback), m_database-&gt;scriptExecutionContext())
+    , m_errorCallbackWrapper(WTF::move(errorCallback), m_database-&gt;scriptExecutionContext())
</ins><span class="cx">     , m_executeSqlAllowed(false)
</span><span class="cx">     , m_readOnly(readOnly)
</span><span class="cx"> {
</span><del>-    ASSERT(m_database);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool SQLTransaction::hasCallback() const
</span><span class="lines">@@ -206,7 +201,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_backend-&gt;currentStatement());
</span><span class="cx"> 
</span><del>-    bool shouldRetryCurrentStatement = m_database-&gt;transactionClient()-&gt;didExceedQuota(database());
</del><ins>+    bool shouldRetryCurrentStatement = m_database-&gt;transactionClient()-&gt;didExceedQuota(&amp;database());
</ins><span class="cx">     m_backend-&gt;setShouldRetryCurrentStatement(shouldRetryCurrentStatement);
</span><span class="cx"> 
</span><span class="cx">     return SQLTransactionState::RunStatements;
</span><span class="lines">@@ -248,10 +243,10 @@
</span><span class="cx">     runStateMachine();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SQLTransaction::executeSQL(const String&amp; sqlStatement, const Vector&lt;SQLValue&gt;&amp; arguments, PassRefPtr&lt;SQLStatementCallback&gt; callback, PassRefPtr&lt;SQLStatementErrorCallback&gt; callbackError, ExceptionCode&amp; e)
</del><ins>+void SQLTransaction::executeSQL(const String&amp; sqlStatement, const Vector&lt;SQLValue&gt;&amp; arguments, RefPtr&lt;SQLStatementCallback&gt;&amp;&amp; callback, RefPtr&lt;SQLStatementErrorCallback&gt;&amp;&amp; callbackError, ExceptionCode&amp; ec)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_executeSqlAllowed || !m_database-&gt;opened()) {
</span><del>-        e = INVALID_STATE_ERR;
</del><ins>+        ec = INVALID_STATE_ERR;
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -261,7 +256,7 @@
</span><span class="cx">     else if (m_readOnly)
</span><span class="cx">         permissions |= DatabaseAuthorizer::ReadOnlyMask;
</span><span class="cx"> 
</span><del>-    auto statement = std::make_unique&lt;SQLStatement&gt;(m_database.get(), callback, callbackError);
</del><ins>+    auto statement = std::make_unique&lt;SQLStatement&gt;(m_database, WTF::move(callback), WTF::move(callbackError));
</ins><span class="cx">     m_backend-&gt;executeSQL(WTF::move(statement), sqlStatement, arguments, permissions);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h (177872 => 177873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h        2015-01-04 06:35:04 UTC (rev 177872)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h        2015-01-04 18:57:44 UTC (rev 177873)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include &quot;SQLStatement.h&quot;
</span><span class="cx"> #include &quot;SQLTransactionStateMachine.h&quot;
</span><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><ins>+#include &lt;wtf/Ref.h&gt;
</ins><span class="cx"> #include &lt;wtf/RefPtr.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -52,21 +53,16 @@
</span><span class="cx"> 
</span><span class="cx"> class SQLTransaction : public SQLTransactionStateMachine&lt;SQLTransaction&gt;, public AbstractSQLTransaction {
</span><span class="cx"> public:
</span><del>-    static PassRefPtr&lt;SQLTransaction&gt; create(Database*, PassRefPtr&lt;SQLTransactionCallback&gt;,
-        PassRefPtr&lt;VoidCallback&gt; successCallback, PassRefPtr&lt;SQLTransactionErrorCallback&gt;,
-        bool readOnly);
</del><ins>+    static Ref&lt;SQLTransaction&gt; create(Ref&lt;Database&gt;&amp;&amp;, RefPtr&lt;SQLTransactionCallback&gt;&amp;&amp;, RefPtr&lt;VoidCallback&gt;&amp;&amp; successCallback, RefPtr&lt;SQLTransactionErrorCallback&gt;&amp;&amp;, bool readOnly);
</ins><span class="cx"> 
</span><span class="cx">     void performPendingCallback();
</span><span class="cx"> 
</span><del>-    void executeSQL(const String&amp; sqlStatement, const Vector&lt;SQLValue&gt;&amp; arguments,
-        PassRefPtr&lt;SQLStatementCallback&gt;, PassRefPtr&lt;SQLStatementErrorCallback&gt;, ExceptionCode&amp;);
</del><ins>+    void executeSQL(const String&amp; sqlStatement, const Vector&lt;SQLValue&gt;&amp; arguments, RefPtr&lt;SQLStatementCallback&gt;&amp;&amp;, RefPtr&lt;SQLStatementErrorCallback&gt;&amp;&amp;, ExceptionCode&amp;);
</ins><span class="cx"> 
</span><del>-    Database* database() { return m_database.get(); }
</del><ins>+    Database&amp; database() { return m_database; }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    SQLTransaction(Database*, PassRefPtr&lt;SQLTransactionCallback&gt;,
-        PassRefPtr&lt;VoidCallback&gt; successCallback, PassRefPtr&lt;SQLTransactionErrorCallback&gt;,
-        bool readOnly);
</del><ins>+    SQLTransaction(Ref&lt;Database&gt;&amp;&amp;, RefPtr&lt;SQLTransactionCallback&gt;&amp;&amp;, RefPtr&lt;VoidCallback&gt;&amp;&amp; successCallback, RefPtr&lt;SQLTransactionErrorCallback&gt;&amp;&amp;, bool readOnly);
</ins><span class="cx"> 
</span><span class="cx">     void clearCallbackWrappers();
</span><span class="cx"> 
</span><span class="lines">@@ -93,7 +89,7 @@
</span><span class="cx"> 
</span><span class="cx">     SQLTransactionState nextStateForTransactionError();
</span><span class="cx"> 
</span><del>-    RefPtr&lt;Database&gt; m_database;
</del><ins>+    Ref&lt;Database&gt; m_database;
</ins><span class="cx">     RefPtr&lt;AbstractSQLTransactionBackend&gt; m_backend;
</span><span class="cx">     SQLCallbackWrapper&lt;SQLTransactionCallback&gt; m_callbackWrapper;
</span><span class="cx">     SQLCallbackWrapper&lt;VoidCallback&gt; m_successCallbackWrapper;
</span></span></pre>
</div>
</div>

</body>
</html>