<!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>[178132] 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/178132">178132</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 14:11:44 -0800 (Thu, 08 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove AbstractSQLTransaction
https://bugs.webkit.org/show_bug.cgi?id=140265

Reviewed by Tim Horton.

* Modules/webdatabase/AbstractSQLTransaction.h: Removed.
* Modules/webdatabase/DatabaseBackend.cpp:
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::~SQLTransaction):
* Modules/webdatabase/SQLTransaction.h:
* Modules/webdatabase/SQLTransactionBackend.cpp:
(WebCore::SQLTransactionBackend::create):
(WebCore::SQLTransactionBackend::SQLTransactionBackend):
* Modules/webdatabase/SQLTransactionBackend.h:
* WebCore.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp</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>
<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>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseAbstractSQLTransactionh">trunk/Source/WebCore/Modules/webdatabase/AbstractSQLTransaction.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/ChangeLog        2015-01-08 22:11:44 UTC (rev 178132)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-08  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        Remove AbstractSQLTransaction
+        https://bugs.webkit.org/show_bug.cgi?id=140265
+
+        Reviewed by Tim Horton.
+
+        * Modules/webdatabase/AbstractSQLTransaction.h: Removed.
+        * Modules/webdatabase/DatabaseBackend.cpp:
+        * Modules/webdatabase/SQLTransaction.cpp:
+        (WebCore::SQLTransaction::~SQLTransaction):
+        * Modules/webdatabase/SQLTransaction.h:
+        * Modules/webdatabase/SQLTransactionBackend.cpp:
+        (WebCore::SQLTransactionBackend::create):
+        (WebCore::SQLTransactionBackend::SQLTransactionBackend):
+        * Modules/webdatabase/SQLTransactionBackend.h:
+        * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-01-08  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] Unreviewed build fix after r178124.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseAbstractSQLTransactionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/AbstractSQLTransaction.h (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/AbstractSQLTransaction.h        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/Modules/webdatabase/AbstractSQLTransaction.h        2015-01-08 22:11:44 UTC (rev 178132)
</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. 
- */
-
-#ifndef AbstractSQLTransaction_h
-#define AbstractSQLTransaction_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include &quot;SQLTransactionState.h&quot;
-#include &lt;wtf/ThreadSafeRefCounted.h&gt;
-
-namespace WebCore {
-
-class SQLTransactionBackend;
-
-class AbstractSQLTransaction : public ThreadSafeRefCounted&lt;AbstractSQLTransaction&gt; {
-public:
-    virtual ~AbstractSQLTransaction() { }
-
-    virtual void requestTransitToState(SQLTransactionState) = 0;
-
-    // Used during initialization only.
-    virtual bool hasCallback() const = 0;
-    virtual bool hasSuccessCallback() const = 0;
-    virtual bool hasErrorCallback() const = 0;
-    virtual void setBackend(SQLTransactionBackend*) = 0;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif // AbstractSQLTransaction_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp        2015-01-08 22:11:44 UTC (rev 178132)
</span><span class="lines">@@ -30,15 +30,20 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;ChangeVersionData.h&quot;
</span><span class="cx"> #include &quot;ChangeVersionWrapper.h&quot;
</span><ins>+#include &quot;Database.h&quot;
</ins><span class="cx"> #include &quot;DatabaseBackendContext.h&quot;
</span><span class="cx"> #include &quot;DatabaseTask.h&quot;
</span><span class="cx"> #include &quot;DatabaseThread.h&quot;
</span><span class="cx"> #include &quot;DatabaseTracker.h&quot;
</span><span class="cx"> #include &quot;Logging.h&quot;
</span><ins>+#include &quot;SQLError.h&quot;
</ins><span class="cx"> #include &quot;SQLTransaction.h&quot;
</span><span class="cx"> #include &quot;SQLTransactionBackend.h&quot;
</span><ins>+#include &quot;SQLTransactionCallback.h&quot;
</ins><span class="cx"> #include &quot;SQLTransactionClient.h&quot;
</span><span class="cx"> #include &quot;SQLTransactionCoordinator.h&quot;
</span><ins>+#include &quot;SQLTransactionErrorCallback.h&quot;
+#include &quot;VoidCallback.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp        2015-01-08 22:11:44 UTC (rev 178132)
</span><span class="lines">@@ -64,6 +64,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+SQLTransaction::~SQLTransaction()
+{
+}
+
</ins><span class="cx"> bool SQLTransaction::hasCallback() const
</span><span class="cx"> {
</span><span class="cx">     return m_callbackWrapper.hasCallback();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h        2015-01-08 22:11:44 UTC (rev 178132)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> 
</span><del>-#include &quot;AbstractSQLTransaction.h&quot;
</del><span class="cx"> #include &quot;SQLCallbackWrapper.h&quot;
</span><span class="cx"> #include &quot;SQLStatement.h&quot;
</span><span class="cx"> #include &quot;SQLTransactionStateMachine.h&quot;
</span><span class="lines">@@ -51,9 +50,10 @@
</span><span class="cx"> class SQLValue;
</span><span class="cx"> class VoidCallback;
</span><span class="cx"> 
</span><del>-class SQLTransaction : public SQLTransactionStateMachine&lt;SQLTransaction&gt;, public AbstractSQLTransaction {
</del><ins>+class SQLTransaction : public ThreadSafeRefCounted&lt;SQLTransaction&gt;, public SQLTransactionStateMachine&lt;SQLTransaction&gt; {
</ins><span class="cx"> public:
</span><span class="cx">     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);
</span><ins>+    ~SQLTransaction();
</ins><span class="cx"> 
</span><span class="cx">     void performPendingCallback();
</span><span class="cx"> 
</span><span class="lines">@@ -61,18 +61,18 @@
</span><span class="cx"> 
</span><span class="cx">     Database&amp; database() { return m_database; }
</span><span class="cx"> 
</span><ins>+    // APIs called from the backend published via SQLTransaction:
+    void requestTransitToState(SQLTransactionState);
+    bool hasCallback() const;
+    bool hasSuccessCallback() const;
+    bool hasErrorCallback() const;
+    void setBackend(SQLTransactionBackend*);
+
</ins><span class="cx"> private:
</span><span class="cx">     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);
</span><span class="cx"> 
</span><span class="cx">     void clearCallbackWrappers();
</span><span class="cx"> 
</span><del>-    // APIs called from the backend published via AbstractSQLTransaction:
-    virtual void requestTransitToState(SQLTransactionState) override;
-    virtual bool hasCallback() const override;
-    virtual bool hasSuccessCallback() const override;
-    virtual bool hasErrorCallback() const override;
-    virtual void setBackend(SQLTransactionBackend*) override;
-
</del><span class="cx">     // State Machine functions:
</span><span class="cx">     virtual StateFunction stateFunctionFor(SQLTransactionState) override;
</span><span class="cx">     bool computeNextStateAndCleanupIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp        2015-01-08 22:11:44 UTC (rev 178132)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> 
</span><del>-#include &quot;AbstractSQLTransaction.h&quot;
</del><span class="cx"> #include &quot;Database.h&quot; // FIXME: Should only be used in the frontend.
</span><span class="cx"> #include &quot;DatabaseAuthorizer.h&quot;
</span><span class="cx"> #include &quot;DatabaseBackend.h&quot;
</span><span class="lines">@@ -347,14 +346,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-PassRefPtr&lt;SQLTransactionBackend&gt; SQLTransactionBackend::create(DatabaseBackend* db,
-    PassRefPtr&lt;AbstractSQLTransaction&gt; frontend, PassRefPtr&lt;SQLTransactionWrapper&gt; wrapper, bool readOnly)
</del><ins>+PassRefPtr&lt;SQLTransactionBackend&gt; SQLTransactionBackend::create(DatabaseBackend* db, PassRefPtr&lt;SQLTransaction&gt; frontend, PassRefPtr&lt;SQLTransactionWrapper&gt; wrapper, bool readOnly)
</ins><span class="cx"> {
</span><span class="cx">     return adoptRef(new SQLTransactionBackend(db, frontend, wrapper, readOnly));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend* db,
-    PassRefPtr&lt;AbstractSQLTransaction&gt; frontend, PassRefPtr&lt;SQLTransactionWrapper&gt; wrapper, bool readOnly)
</del><ins>+SQLTransactionBackend::SQLTransactionBackend(DatabaseBackend* db, PassRefPtr&lt;SQLTransaction&gt; frontend, PassRefPtr&lt;SQLTransactionWrapper&gt; wrapper, bool readOnly)
</ins><span class="cx">     : m_frontend(frontend)
</span><span class="cx">     , m_database(db)
</span><span class="cx">     , m_wrapper(wrapper)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h        2015-01-08 22:11:44 UTC (rev 178132)
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class AbstractSQLTransaction;
</del><span class="cx"> class DatabaseBackend;
</span><span class="cx"> class OriginLock;
</span><span class="cx"> class SQLError;
</span><span class="cx"> class SQLiteTransaction;
</span><span class="cx"> class SQLStatement;
</span><span class="cx"> class SQLStatementBackend;
</span><ins>+class SQLTransaction;
</ins><span class="cx"> class SQLTransactionBackend;
</span><span class="cx"> class SQLValue;
</span><span class="cx"> 
</span><span class="lines">@@ -61,8 +61,7 @@
</span><span class="cx"> 
</span><span class="cx"> class SQLTransactionBackend : public ThreadSafeRefCounted&lt;SQLTransactionBackend&gt;, public SQLTransactionStateMachine&lt;SQLTransactionBackend&gt; {
</span><span class="cx"> public:
</span><del>-    static PassRefPtr&lt;SQLTransactionBackend&gt; create(DatabaseBackend*,
-        PassRefPtr&lt;AbstractSQLTransaction&gt;, PassRefPtr&lt;SQLTransactionWrapper&gt;, bool readOnly);
</del><ins>+    static PassRefPtr&lt;SQLTransactionBackend&gt; create(DatabaseBackend*, PassRefPtr&lt;SQLTransaction&gt;, PassRefPtr&lt;SQLTransactionWrapper&gt;, bool readOnly);
</ins><span class="cx"> 
</span><span class="cx">     virtual ~SQLTransactionBackend();
</span><span class="cx"> 
</span><span class="lines">@@ -85,8 +84,7 @@
</span><span class="cx">     void executeSQL(std::unique_ptr&lt;SQLStatement&gt;, const String&amp; statement, const Vector&lt;SQLValue&gt;&amp; arguments, int permissions);
</span><span class="cx">     
</span><span class="cx"> private:
</span><del>-    SQLTransactionBackend(DatabaseBackend*, PassRefPtr&lt;AbstractSQLTransaction&gt;,
-        PassRefPtr&lt;SQLTransactionWrapper&gt;, bool readOnly);
</del><ins>+    SQLTransactionBackend(DatabaseBackend*, PassRefPtr&lt;SQLTransaction&gt;, PassRefPtr&lt;SQLTransactionWrapper&gt;, bool readOnly);
</ins><span class="cx"> 
</span><span class="cx">     void doCleanup();
</span><span class="cx"> 
</span><span class="lines">@@ -116,7 +114,7 @@
</span><span class="cx">     void acquireOriginLock();
</span><span class="cx">     void releaseOriginLockIfNeeded();
</span><span class="cx"> 
</span><del>-    RefPtr&lt;AbstractSQLTransaction&gt; m_frontend; // Has a reference cycle, and will break in doCleanup().
</del><ins>+    RefPtr&lt;SQLTransaction&gt; m_frontend; // Has a reference cycle, and will break in doCleanup().
</ins><span class="cx">     RefPtr&lt;SQLStatementBackend&gt; m_currentStatementBackend;
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;DatabaseBackend&gt; m_database;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (178131 => 178132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2015-01-08 21:55:40 UTC (rev 178131)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2015-01-08 22:11:44 UTC (rev 178132)
</span><span class="lines">@@ -7697,7 +7697,6 @@
</span><span class="cx">                 1A3586DE15264C450022A659 /* RenderMultiColumnFlowThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMultiColumnFlowThread.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A3763691A2E68BB009A7EE2 /* StorageNamespaceProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceProvider.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A37636A1A2E68BB009A7EE2 /* StorageNamespaceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceProvider.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                1A40CDD01A5DF74700E9D4DB /* AbstractSQLTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractSQLTransaction.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 1A494BBB0A122DCD00FDAFC1 /* HTMLElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLElement.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A494BF80A122F4400FDAFC1 /* JSHTMLElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElement.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1A494BF90A122F4400FDAFC1 /* JSHTMLElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLElement.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -18293,7 +18292,6 @@
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><span class="cx">                                 FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */,
</span><del>-                                1A40CDD01A5DF74700E9D4DB /* AbstractSQLTransaction.h */,
</del><span class="cx">                                 FE36FD1116C7826400F887C1 /* ChangeVersionData.h */,
</span><span class="cx">                                 97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */,
</span><span class="cx">                                 97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */,
</span></span></pre>
</div>
</div>

</body>
</html>