Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (188080 => 188081)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-06 23:21:04 UTC (rev 188081)
@@ -1013,7 +1013,6 @@
Modules/webdatabase/SQLException.cpp
Modules/webdatabase/SQLResultSet.cpp
Modules/webdatabase/SQLResultSetRowList.cpp
- Modules/webdatabase/SQLStatement.cpp
Modules/webdatabase/SQLStatementBackend.cpp
Modules/webdatabase/SQLTransaction.cpp
Modules/webdatabase/SQLTransactionBackend.cpp
Modified: trunk/Source/WebCore/ChangeLog (188080 => 188081)
--- trunk/Source/WebCore/ChangeLog 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/ChangeLog 2015-08-06 23:21:04 UTC (rev 188081)
@@ -1,3 +1,39 @@
+2015-08-06 Anders Carlsson <ander...@apple.com>
+
+ Merge SQLStatement into SQLStatementBackend
+ https://bugs.webkit.org/show_bug.cgi?id=147754
+
+ Reviewed by Geoffrey Garen.
+
+ * CMakeLists.txt:
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/SQLStatement.cpp: Removed.
+ (WebCore::SQLStatement::SQLStatement): Deleted.
+ (WebCore::SQLStatement::setBackend): Deleted.
+ (WebCore::SQLStatement::hasCallback): Deleted.
+ (WebCore::SQLStatement::hasErrorCallback): Deleted.
+ (WebCore::SQLStatement::performCallback): Deleted.
+ * Modules/webdatabase/SQLStatement.h: Removed.
+ * Modules/webdatabase/SQLStatementBackend.cpp:
+ (WebCore::SQLStatementBackend::SQLStatementBackend):
+ (WebCore::SQLStatementBackend::performCallback):
+ (WebCore::SQLStatementBackend::frontend): Deleted.
+ * Modules/webdatabase/SQLStatementBackend.h:
+ (WebCore::SQLStatementBackend::hasStatementCallback):
+ (WebCore::SQLStatementBackend::hasStatementErrorCallback):
+ * Modules/webdatabase/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::deliverStatementCallback):
+ (WebCore::SQLTransaction::executeSQL):
+ * Modules/webdatabase/SQLTransaction.h:
+ * Modules/webdatabase/SQLTransactionBackend.cpp:
+ (WebCore::SQLTransactionBackend::currentStatement):
+ (WebCore::SQLTransactionBackend::executeSQL):
+ * Modules/webdatabase/SQLTransactionBackend.h:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSSQLTransactionCustom.cpp:
+
2015-08-06 Chris Dumez <cdu...@apple.com>
Toggle GPS state based on page visibility to save battery
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-06 23:21:04 UTC (rev 188081)
@@ -169,7 +169,6 @@
friend class ChangeVersionWrapper;
friend class DatabaseManager;
friend class DatabaseServer; // FIXME: remove this when the backend has been split out.
- friend class SQLStatement;
friend class SQLTransaction;
friend class SQLTransactionBackend;
};
Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatement.cpp 2015-08-06 23:21:04 UTC (rev 188081)
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2007, 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.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 "SQLStatement.h"
-
-#include "AbstractDatabaseServer.h"
-#include "Database.h"
-#include "DatabaseManager.h"
-#include "Logging.h"
-#include "SQLError.h"
-#include "SQLStatementBackend.h"
-#include "SQLStatementCallback.h"
-#include "SQLStatementErrorCallback.h"
-#include "SQLTransaction.h"
-#include "SQLValue.h"
-#include "SQLiteDatabase.h"
-#include "SQLiteStatement.h"
-#include <wtf/text/CString.h>
-
-namespace WebCore {
-
-SQLStatement::SQLStatement(Database& database, PassRefPtr<SQLStatementCallback> callback, PassRefPtr<SQLStatementErrorCallback> errorCallback)
- : m_statementCallbackWrapper(callback, database.scriptExecutionContext())
- , m_statementErrorCallbackWrapper(errorCallback, database.scriptExecutionContext())
-{
-}
-
-void SQLStatement::setBackend(SQLStatementBackend* backend)
-{
- m_backend = backend;
-}
-
-bool SQLStatement::hasCallback()
-{
- return m_statementCallbackWrapper.hasCallback();
-}
-
-bool SQLStatement::hasErrorCallback()
-{
- return m_statementErrorCallbackWrapper.hasCallback();
-}
-
-bool SQLStatement::performCallback(SQLTransaction* transaction)
-{
- ASSERT(transaction);
- ASSERT(m_backend);
-
- bool callbackError = false;
-
- RefPtr<SQLStatementCallback> callback = m_statementCallbackWrapper.unwrap();
- RefPtr<SQLStatementErrorCallback> errorCallback = m_statementErrorCallbackWrapper.unwrap();
- RefPtr<SQLError> error = m_backend->sqlError();
-
- // Call the appropriate statement callback and track if it resulted in an error,
- // because then we need to jump to the transaction error callback.
- if (error) {
- if (errorCallback)
- callbackError = errorCallback->handleEvent(transaction, error.get());
- } else if (callback) {
- RefPtr<SQLResultSet> resultSet = m_backend->sqlResultSet();
- callbackError = !callback->handleEvent(transaction, resultSet.get());
- }
-
- return callbackError;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatement.h 2015-08-06 23:21:04 UTC (rev 188081)
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2007, 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.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 SQLStatement_h
-#define SQLStatement_h
-
-#include "SQLCallbackWrapper.h"
-#include "SQLResultSet.h"
-#include "SQLValue.h"
-#include <wtf/Forward.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class Database;
-class SQLError;
-class SQLStatementBackend;
-class SQLStatementCallback;
-class SQLStatementErrorCallback;
-class SQLTransaction;
-
-class SQLStatement {
-public:
- SQLStatement(Database&, PassRefPtr<SQLStatementCallback>, PassRefPtr<SQLStatementErrorCallback>);
-
- bool performCallback(SQLTransaction*);
-
- void setBackend(SQLStatementBackend*);
-
- bool hasCallback();
- bool hasErrorCallback();
-
-private:
- // The SQLStatementBackend owns the SQLStatement. Hence, the backend is
- // guaranteed to be outlive the SQLStatement, and it is safe for us to refer
- // to the backend using a raw pointer here.
- SQLStatementBackend* m_backend;
-
- SQLCallbackWrapper<SQLStatementCallback> m_statementCallbackWrapper;
- SQLCallbackWrapper<SQLStatementErrorCallback> m_statementErrorCallbackWrapper;
-};
-
-} // namespace WebCore
-
-#endif // SQLStatement_h
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.cpp 2015-08-06 23:21:04 UTC (rev 188081)
@@ -32,7 +32,6 @@
#include "Logging.h"
#include "SQLError.h"
#include "SQLResultSet.h"
-#include "SQLStatement.h"
#include "SQLStatementCallback.h"
#include "SQLStatementErrorCallback.h"
#include "SQLValue.h"
@@ -75,27 +74,19 @@
namespace WebCore {
-SQLStatementBackend::SQLStatementBackend(std::unique_ptr<SQLStatement> frontend,
- const String& statement, const Vector<SQLValue>& arguments, int permissions)
- : m_frontend(WTF::move(frontend))
- , m_statement(statement.isolatedCopy())
+SQLStatementBackend::SQLStatementBackend(Database& database, const String& statement, const Vector<SQLValue>& arguments, PassRefPtr<SQLStatementCallback> callback, PassRefPtr<SQLStatementErrorCallback> errorCallback, int permissions)
+ : m_statement(statement.isolatedCopy())
, m_arguments(arguments)
- , m_hasCallback(m_frontend->hasCallback())
- , m_hasErrorCallback(m_frontend->hasErrorCallback())
+ , m_statementCallbackWrapper(callback, database.scriptExecutionContext())
+ , m_statementErrorCallbackWrapper(errorCallback, database.scriptExecutionContext())
, m_permissions(permissions)
{
- m_frontend->setBackend(this);
}
SQLStatementBackend::~SQLStatementBackend()
{
}
-SQLStatement* SQLStatementBackend::frontend()
-{
- return m_frontend.get();
-}
-
PassRefPtr<SQLError> SQLStatementBackend::sqlError() const
{
return m_error;
@@ -208,6 +199,29 @@
return true;
}
+bool SQLStatementBackend::performCallback(SQLTransaction* transaction)
+{
+ ASSERT(transaction);
+
+ bool callbackError = false;
+
+ RefPtr<SQLStatementCallback> callback = m_statementCallbackWrapper.unwrap();
+ RefPtr<SQLStatementErrorCallback> errorCallback = m_statementErrorCallbackWrapper.unwrap();
+ RefPtr<SQLError> error = sqlError();
+
+ // Call the appropriate statement callback and track if it resulted in an error,
+ // because then we need to jump to the transaction error callback.
+ if (error) {
+ if (errorCallback)
+ callbackError = errorCallback->handleEvent(transaction, error.get());
+ } else if (callback) {
+ RefPtr<SQLResultSet> resultSet = sqlResultSet();
+ callbackError = !callback->handleEvent(transaction, resultSet.get());
+ }
+
+ return callbackError;
+}
+
void SQLStatementBackend::setDatabaseDeletedError()
{
ASSERT(!m_error && !m_resultSet);
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementBackend.h 2015-08-06 23:21:04 UTC (rev 188081)
@@ -20,7 +20,7 @@
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS 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
+ * 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.
@@ -28,6 +28,9 @@
#ifndef SQLStatementBackend_h
#define SQLStatementBackend_h
+#include "SQLCallbackWrapper.h"
+#include "SQLStatementCallback.h"
+#include "SQLStatementErrorCallback.h"
#include "SQLValue.h"
#include <wtf/Forward.h>
#include <wtf/Vector.h>
@@ -38,24 +41,23 @@
class Database;
class SQLError;
class SQLResultSet;
-class SQLStatement;
class SQLTransactionBackend;
class SQLStatementBackend {
public:
- SQLStatementBackend(std::unique_ptr<SQLStatement>, const String& statement, const Vector<SQLValue>& arguments, int permissions);
+ SQLStatementBackend(Database&, const String&, const Vector<SQLValue>&, PassRefPtr<SQLStatementCallback>, PassRefPtr<SQLStatementErrorCallback>, int permissions);
~SQLStatementBackend();
bool execute(Database&);
bool lastExecutionFailedDueToQuota() const;
- bool hasStatementCallback() const { return m_hasCallback; }
- bool hasStatementErrorCallback() const { return m_hasErrorCallback; }
+ bool hasStatementCallback() const { return m_statementCallbackWrapper.hasCallback(); }
+ bool hasStatementErrorCallback() const { return m_statementErrorCallbackWrapper.hasCallback(); }
+ bool performCallback(SQLTransaction*);
void setDatabaseDeletedError();
void setVersionMismatchedError();
- SQLStatement* frontend();
PassRefPtr<SQLError> sqlError() const;
PassRefPtr<SQLResultSet> sqlResultSet() const;
@@ -63,11 +65,10 @@
void setFailureDueToQuota();
void clearFailureDueToQuota();
- std::unique_ptr<SQLStatement> m_frontend;
String m_statement;
Vector<SQLValue> m_arguments;
- bool m_hasCallback;
- bool m_hasErrorCallback;
+ SQLCallbackWrapper<SQLStatementCallback> m_statementCallbackWrapper;
+ SQLCallbackWrapper<SQLStatementErrorCallback> m_statementErrorCallbackWrapper;
RefPtr<SQLError> m_error;
RefPtr<SQLResultSet> m_resultSet;
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2015-08-06 23:21:04 UTC (rev 188081)
@@ -35,6 +35,7 @@
#include "ExceptionCode.h"
#include "Logging.h"
#include "SQLError.h"
+#include "SQLStatementBackend.h"
#include "SQLStatementCallback.h"
#include "SQLStatementErrorCallback.h"
#include "SQLTransactionBackend.h"
@@ -184,7 +185,7 @@
// Otherwise, continue to loop through the statement queue
m_executeSqlAllowed = true;
- SQLStatement* currentStatement = m_backend->currentStatement();
+ SQLStatementBackend* currentStatement = m_backend->currentStatement();
ASSERT(currentStatement);
bool result = currentStatement->performCallback(this);
@@ -257,8 +258,8 @@
else if (m_readOnly)
permissions |= DatabaseAuthorizer::ReadOnlyMask;
- auto statement = std::make_unique<SQLStatement>(m_database, WTF::move(callback), WTF::move(callbackError));
- m_backend->executeSQL(WTF::move(statement), sqlStatement, arguments, permissions);
+ auto statement = std::make_unique<SQLStatementBackend>(m_database, sqlStatement, arguments, WTF::move(callback), WTF::move(callbackError), permissions);
+ m_backend->executeSQL(WTF::move(statement));
}
bool SQLTransaction::computeNextStateAndCleanupIfNeeded()
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2015-08-06 23:21:04 UTC (rev 188081)
@@ -30,7 +30,6 @@
#define SQLTransaction_h
#include "SQLCallbackWrapper.h"
-#include "SQLStatement.h"
#include "SQLTransactionStateMachine.h"
#include <wtf/PassRefPtr.h>
#include <wtf/Ref.h>
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.cpp 2015-08-06 23:21:04 UTC (rev 188081)
@@ -423,9 +423,9 @@
m_wrapper = nullptr;
}
-SQLStatement* SQLTransactionBackend::currentStatement()
+SQLStatementBackend* SQLTransactionBackend::currentStatement()
{
- return m_currentStatementBackend->frontend();
+ return m_currentStatementBackend.get();
}
PassRefPtr<SQLError> SQLTransactionBackend::transactionError()
@@ -523,10 +523,8 @@
}
#endif
-void SQLTransactionBackend::executeSQL(std::unique_ptr<SQLStatement> statement, const String& sqlStatement, const Vector<SQLValue>& arguments, int permissions)
+void SQLTransactionBackend::executeSQL(std::unique_ptr<SQLStatementBackend> statementBackend)
{
- auto statementBackend = std::make_unique<SQLStatementBackend>(WTF::move(statement), sqlStatement, arguments, permissions);
-
if (m_database->deleted())
statementBackend->setDatabaseDeletedError();
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h (188080 => 188081)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackend.h 2015-08-06 23:21:04 UTC (rev 188081)
@@ -42,7 +42,6 @@
class OriginLock;
class SQLError;
class SQLiteTransaction;
-class SQLStatement;
class SQLStatementBackend;
class SQLTransaction;
class SQLTransactionBackend;
@@ -77,9 +76,9 @@
// APIs called from the frontend published via SQLTransactionBackend:
void requestTransitToState(SQLTransactionState);
PassRefPtr<SQLError> transactionError();
- SQLStatement* currentStatement();
+ SQLStatementBackend* currentStatement();
void setShouldRetryCurrentStatement(bool);
- void executeSQL(std::unique_ptr<SQLStatement>, const String& statement, const Vector<SQLValue>& arguments, int permissions);
+ void executeSQL(std::unique_ptr<SQLStatementBackend>);
private:
SQLTransactionBackend(Database*, PassRefPtr<SQLTransaction>, PassRefPtr<SQLTransactionWrapper>, bool readOnly);
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (188080 => 188081)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-06 23:21:04 UTC (rev 188081)
@@ -6819,7 +6819,6 @@
<ClCompile Include="..\Modules\webdatabase\SQLException.cpp" />
<ClCompile Include="..\Modules\webdatabase\SQLResultSet.cpp" />
<ClCompile Include="..\Modules\webdatabase\SQLResultSetRowList.cpp" />
- <ClCompile Include="..\Modules\webdatabase\SQLStatement.cpp" />
<ClCompile Include="..\Modules\webdatabase\SQLStatementBackend.cpp" />
<ClCompile Include="..\Modules\webdatabase\SQLTransaction.cpp" />
<ClCompile Include="..\Modules\webdatabase\SQLTransactionBackend.cpp" />
@@ -20562,7 +20561,6 @@
<ClInclude Include="..\Modules\webdatabase\SQLException.h" />
<ClInclude Include="..\Modules\webdatabase\SQLResultSet.h" />
<ClInclude Include="..\Modules\webdatabase\SQLResultSetRowList.h" />
- <ClInclude Include="..\Modules\webdatabase\SQLStatement.h" />
<ClInclude Include="..\Modules\webdatabase\SQLStatementBackend.h" />
<ClInclude Include="..\Modules\webdatabase\SQLStatementCallback.h" />
<ClInclude Include="..\Modules\webdatabase\SQLStatementErrorCallback.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (188080 => 188081)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-06 23:21:04 UTC (rev 188081)
@@ -516,9 +516,6 @@
<ClCompile Include="..\Modules\webdatabase\SQLResultSetRowList.cpp">
<Filter>Modules\webdatabase</Filter>
</ClCompile>
- <ClCompile Include="..\Modules\webdatabase\SQLStatement.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
<ClCompile Include="..\Modules\webdatabase\SQLStatementBackend.cpp">
<Filter>Modules\webdatabase</Filter>
</ClCompile>
@@ -7490,9 +7487,6 @@
<ClInclude Include="..\Modules\webdatabase\SQLResultSetRowList.h">
<Filter>Modules\webdatabase</Filter>
</ClInclude>
- <ClInclude Include="..\Modules\webdatabase\SQLStatement.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
<ClInclude Include="..\Modules\webdatabase\SQLStatementBackend.h">
<Filter>Modules\webdatabase</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (188080 => 188081)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-06 23:21:04 UTC (rev 188081)
@@ -3727,8 +3727,6 @@
97BC6A421505F081001B74AC /* SQLResultSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A001505F081001B74AC /* SQLResultSet.h */; };
97BC6A441505F081001B74AC /* SQLResultSetRowList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A021505F081001B74AC /* SQLResultSetRowList.cpp */; };
97BC6A451505F081001B74AC /* SQLResultSetRowList.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A031505F081001B74AC /* SQLResultSetRowList.h */; };
- 97BC6A471505F081001B74AC /* SQLStatement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A051505F081001B74AC /* SQLStatement.cpp */; };
- 97BC6A481505F081001B74AC /* SQLStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A061505F081001B74AC /* SQLStatement.h */; };
97BC6A491505F081001B74AC /* SQLStatementCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A071505F081001B74AC /* SQLStatementCallback.h */; };
97BC6A4B1505F081001B74AC /* SQLStatementErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A091505F081001B74AC /* SQLStatementErrorCallback.h */; };
97BC6A4F1505F081001B74AC /* SQLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A0D1505F081001B74AC /* SQLTransaction.cpp */; };
@@ -11067,8 +11065,6 @@
97BC6A021505F081001B74AC /* SQLResultSetRowList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLResultSetRowList.cpp; sourceTree = "<group>"; };
97BC6A031505F081001B74AC /* SQLResultSetRowList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLResultSetRowList.h; sourceTree = "<group>"; };
97BC6A041505F081001B74AC /* SQLResultSetRowList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLResultSetRowList.idl; sourceTree = "<group>"; };
- 97BC6A051505F081001B74AC /* SQLStatement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLStatement.cpp; sourceTree = "<group>"; };
- 97BC6A061505F081001B74AC /* SQLStatement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLStatement.h; sourceTree = "<group>"; };
97BC6A071505F081001B74AC /* SQLStatementCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLStatementCallback.h; sourceTree = "<group>"; };
97BC6A081505F081001B74AC /* SQLStatementCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLStatementCallback.idl; sourceTree = "<group>"; };
97BC6A091505F081001B74AC /* SQLStatementErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLStatementErrorCallback.h; sourceTree = "<group>"; };
@@ -18810,8 +18806,6 @@
97BC6A021505F081001B74AC /* SQLResultSetRowList.cpp */,
97BC6A031505F081001B74AC /* SQLResultSetRowList.h */,
97BC6A041505F081001B74AC /* SQLResultSetRowList.idl */,
- 97BC6A051505F081001B74AC /* SQLStatement.cpp */,
- 97BC6A061505F081001B74AC /* SQLStatement.h */,
FE8A674516CDD19E00930BF8 /* SQLStatementBackend.cpp */,
FE8A674616CDD19E00930BF8 /* SQLStatementBackend.h */,
97BC6A071505F081001B74AC /* SQLStatementCallback.h */,
@@ -26726,7 +26720,6 @@
1A22464E0CC98DDB00C05240 /* SQLiteTransaction.h in Headers */,
97BC6A421505F081001B74AC /* SQLResultSet.h in Headers */,
97BC6A451505F081001B74AC /* SQLResultSetRowList.h in Headers */,
- 97BC6A481505F081001B74AC /* SQLStatement.h in Headers */,
FE8A674816CDD19E00930BF8 /* SQLStatementBackend.h in Headers */,
97BC6A491505F081001B74AC /* SQLStatementCallback.h in Headers */,
97BC6A4B1505F081001B74AC /* SQLStatementErrorCallback.h in Headers */,
@@ -30195,7 +30188,6 @@
1A22464D0CC98DDB00C05240 /* SQLiteTransaction.cpp in Sources */,
97BC6A411505F081001B74AC /* SQLResultSet.cpp in Sources */,
97BC6A441505F081001B74AC /* SQLResultSetRowList.cpp in Sources */,
- 97BC6A471505F081001B74AC /* SQLStatement.cpp in Sources */,
FE8A674716CDD19E00930BF8 /* SQLStatementBackend.cpp in Sources */,
97BC6A4F1505F081001B74AC /* SQLTransaction.cpp in Sources */,
FEE1811316C319E800084849 /* SQLTransactionBackend.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp (188080 => 188081)
--- trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2015-08-06 23:15:24 UTC (rev 188080)
+++ trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2015-08-06 23:21:04 UTC (rev 188081)
@@ -35,6 +35,7 @@
#include "JSSQLStatementErrorCallback.h"
#include "JSDOMWindowCustom.h"
#include "SQLTransaction.h"
+#include "SQLValue.h"
using namespace JSC;
