<!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>[178209] 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/178209">178209</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-09 15:15:35 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more sync database code
https://bugs.webkit.org/show_bug.cgi?id=140318
Reviewed by Sam Weinig.
* CMakeLists.txt:
* DerivedSources.make:
* Modules/webdatabase/DatabaseBackendSync.cpp: Removed.
* Modules/webdatabase/DatabaseBackendSync.h: Removed.
* Modules/webdatabase/DatabaseCallback.h:
* Modules/webdatabase/DatabaseCallback.idl:
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::openDatabaseSync): Deleted.
* Modules/webdatabase/DatabaseManager.h:
* Modules/webdatabase/DatabaseServer.cpp:
(WebCore::DatabaseServer::createDatabase):
* Modules/webdatabase/DatabaseSync.cpp: Removed.
* Modules/webdatabase/DatabaseSync.h: Removed.
* Modules/webdatabase/DatabaseSync.idl: Removed.
* Modules/webdatabase/SQLStatementSync.cpp: Removed.
* Modules/webdatabase/SQLStatementSync.h: Removed.
* Modules/webdatabase/SQLTransactionBackendSync.cpp: Removed.
* Modules/webdatabase/SQLTransactionBackendSync.h: Removed.
* Modules/webdatabase/SQLTransactionSync.cpp: Removed.
* Modules/webdatabase/SQLTransactionSync.h: Removed.
* Modules/webdatabase/SQLTransactionSync.idl: Removed.
* Modules/webdatabase/SQLTransactionSyncCallback.h: Removed.
* Modules/webdatabase/SQLTransactionSyncCallback.idl: Removed.
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSSQLTransactionSyncCustom.cpp: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackh">trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackidl">trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendSynccpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendSynch">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseSynccpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseSynch">trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseSyncidl">trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementSynccpp">trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLStatementSynch">trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendSynccpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendSynch">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionSynccpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionSynch">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionSyncidl">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.idl</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionSyncCallbackh">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionSyncCallbackidl">trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSQLTransactionSyncCustomcpp">trunk/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -302,7 +302,6 @@
</span><span class="cx"> Modules/webdatabase/DOMWindowWebDatabase.idl
</span><span class="cx"> Modules/webdatabase/Database.idl
</span><span class="cx"> Modules/webdatabase/DatabaseCallback.idl
</span><del>- Modules/webdatabase/DatabaseSync.idl
</del><span class="cx"> Modules/webdatabase/SQLError.idl
</span><span class="cx"> Modules/webdatabase/SQLException.idl
</span><span class="cx"> Modules/webdatabase/SQLResultSet.idl
</span><span class="lines">@@ -312,8 +311,6 @@
</span><span class="cx"> Modules/webdatabase/SQLTransaction.idl
</span><span class="cx"> Modules/webdatabase/SQLTransactionCallback.idl
</span><span class="cx"> Modules/webdatabase/SQLTransactionErrorCallback.idl
</span><del>- Modules/webdatabase/SQLTransactionSync.idl
- Modules/webdatabase/SQLTransactionSyncCallback.idl
</del><span class="cx">
</span><span class="cx"> Modules/websockets/CloseEvent.idl
</span><span class="cx"> Modules/websockets/WebSocket.idl
</span><span class="lines">@@ -954,12 +951,10 @@
</span><span class="cx"> Modules/webdatabase/DatabaseBackend.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseBackendBase.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseBackendContext.cpp
</span><del>- Modules/webdatabase/DatabaseBackendSync.cpp
</del><span class="cx"> Modules/webdatabase/DatabaseBase.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseContext.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseManager.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseServer.cpp
</span><del>- Modules/webdatabase/DatabaseSync.cpp
</del><span class="cx"> Modules/webdatabase/DatabaseTask.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseThread.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseTracker.cpp
</span><span class="lines">@@ -969,14 +964,11 @@
</span><span class="cx"> Modules/webdatabase/SQLResultSetRowList.cpp
</span><span class="cx"> Modules/webdatabase/SQLStatement.cpp
</span><span class="cx"> Modules/webdatabase/SQLStatementBackend.cpp
</span><del>- Modules/webdatabase/SQLStatementSync.cpp
</del><span class="cx"> Modules/webdatabase/SQLTransaction.cpp
</span><span class="cx"> Modules/webdatabase/SQLTransactionBackend.cpp
</span><del>- Modules/webdatabase/SQLTransactionBackendSync.cpp
</del><span class="cx"> Modules/webdatabase/SQLTransactionClient.cpp
</span><span class="cx"> Modules/webdatabase/SQLTransactionCoordinator.cpp
</span><span class="cx"> Modules/webdatabase/SQLTransactionStateMachine.cpp
</span><del>- Modules/webdatabase/SQLTransactionSync.cpp
</del><span class="cx">
</span><span class="cx"> Modules/websockets/ThreadableWebSocketChannel.cpp
</span><span class="cx"> Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
</span><span class="lines">@@ -1136,7 +1128,6 @@
</span><span class="cx"> bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
</span><span class="cx"> bindings/js/JSSQLResultSetRowListCustom.cpp
</span><span class="cx"> bindings/js/JSSQLTransactionCustom.cpp
</span><del>- bindings/js/JSSQLTransactionSyncCustom.cpp
</del><span class="cx"> bindings/js/JSSVGElementInstanceCustom.cpp
</span><span class="cx"> bindings/js/JSSVGLengthCustom.cpp
</span><span class="cx"> bindings/js/JSSVGPathSegCustom.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/ChangeLog 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-01-09 Anders Carlsson <andersca@apple.com>
+
+ Remove more sync database code
+ https://bugs.webkit.org/show_bug.cgi?id=140318
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * Modules/webdatabase/DatabaseBackendSync.cpp: Removed.
+ * Modules/webdatabase/DatabaseBackendSync.h: Removed.
+ * Modules/webdatabase/DatabaseCallback.h:
+ * Modules/webdatabase/DatabaseCallback.idl:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::openDatabaseSync): Deleted.
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ (WebCore::DatabaseServer::createDatabase):
+ * Modules/webdatabase/DatabaseSync.cpp: Removed.
+ * Modules/webdatabase/DatabaseSync.h: Removed.
+ * Modules/webdatabase/DatabaseSync.idl: Removed.
+ * Modules/webdatabase/SQLStatementSync.cpp: Removed.
+ * Modules/webdatabase/SQLStatementSync.h: Removed.
+ * Modules/webdatabase/SQLTransactionBackendSync.cpp: Removed.
+ * Modules/webdatabase/SQLTransactionBackendSync.h: Removed.
+ * Modules/webdatabase/SQLTransactionSync.cpp: Removed.
+ * Modules/webdatabase/SQLTransactionSync.h: Removed.
+ * Modules/webdatabase/SQLTransactionSync.idl: Removed.
+ * Modules/webdatabase/SQLTransactionSyncCallback.h: Removed.
+ * Modules/webdatabase/SQLTransactionSyncCallback.idl: Removed.
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSSQLTransactionSyncCustom.cpp: Removed.
+
</ins><span class="cx"> 2015-01-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove or use TimelineAgent Resource related event types
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/DerivedSources.make 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -197,7 +197,6 @@
</span><span class="cx"> $(WebCore)/Modules/webdatabase/DOMWindowWebDatabase.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/Database.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/DatabaseCallback.idl \
</span><del>- $(WebCore)/Modules/webdatabase/DatabaseSync.idl \
</del><span class="cx"> $(WebCore)/Modules/webdatabase/SQLError.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLException.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLResultSet.idl \
</span><span class="lines">@@ -207,8 +206,6 @@
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLTransaction.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLTransactionCallback.idl \
</span><span class="cx"> $(WebCore)/Modules/webdatabase/SQLTransactionErrorCallback.idl \
</span><del>- $(WebCore)/Modules/webdatabase/SQLTransactionSync.idl \
- $(WebCore)/Modules/webdatabase/SQLTransactionSyncCallback.idl \
</del><span class="cx"> $(WebCore)/Modules/websockets/CloseEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/websockets/WebSocket.idl \
</span><span class="cx"> $(WebCore)/crypto/CryptoKey.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendSynccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,62 +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.
- */
-
-#include "config.h"
-#include "DatabaseBackendSync.h"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseBackendContext.h"
-#include "DatabaseTracker.h"
-
-namespace WebCore {
-
-DatabaseBackendSync::DatabaseBackendSync(PassRefPtr<DatabaseBackendContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBackendBase(databaseContext, name, expectedVersion, displayName, estimatedSize, DatabaseType::Sync)
-{
-}
-
-DatabaseBackendSync::~DatabaseBackendSync()
-{
- // SQLite is "multi-thread safe", but each database handle can only be used
- // on a single thread at a time.
- //
- // For DatabaseBackendSync, we open the SQLite database on the script context
- // thread. And hence we should also close it on that same thread. This means
- // that the SQLite database need to be closed here in the destructor.
-
- ASSERT(m_databaseContext->isContextThread());
- if (opened())
- closeDatabase();
-}
-
-bool DatabaseBackendSync::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
-{
- return performOpenAndVerify(setVersionInNewDatabase, error, errorMessage);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendSynch"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,60 +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 DatabaseBackendSync_h
-#define DatabaseBackendSync_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseBackendBase.h"
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class DatabaseServer;
-
-// FIXME: This implementation of DatabaseBackendSync is only a place holder
-// for the split out of the DatabaseSync backend to be done later. This
-// place holder is needed to allow other code that need to reference the
-// DatabaseBackendSync to do so before the proper backend split is
-// available. This should be replaced with the actual implementation later.
-
-class DatabaseBackendSync : public DatabaseBackendBase {
-public:
- virtual ~DatabaseBackendSync();
-
- virtual bool openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
-
-protected:
- DatabaseBackendSync(PassRefPtr<DatabaseBackendContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
-
- friend class DatabaseServer;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif // DatabaseBackendSync_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~DatabaseCallback() { }
</span><span class="cx"> virtual bool handleEvent(Database*) = 0;
</span><del>- virtual bool handleEvent(DatabaseSync*) = 0;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseCallbackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -30,5 +30,4 @@
</span><span class="cx"> Conditional=SQL_DATABASE,
</span><span class="cx"> ] callback interface DatabaseCallback {
</span><span class="cx"> boolean handleEvent(Database database);
</span><del>- boolean handleEvent(DatabaseSync database);
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -33,11 +33,9 @@
</span><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx"> #include "DatabaseBackendBase.h"
</span><span class="cx"> #include "DatabaseBackendContext.h"
</span><del>-#include "DatabaseBackendSync.h"
</del><span class="cx"> #include "DatabaseCallback.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseStrategy.h"
</span><del>-#include "DatabaseSync.h"
</del><span class="cx"> #include "DatabaseTask.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "InspectorDatabaseInstrumentation.h"
</span><span class="lines">@@ -320,31 +318,6 @@
</span><span class="cx"> return database.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DatabaseSync> DatabaseManager::openDatabaseSync(ScriptExecutionContext* context,
- const String& name, const String& expectedVersion, const String& displayName,
- unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, DatabaseError& error)
-{
- ASSERT(context->isContextThread());
- ASSERT(error == DatabaseError::None);
-
- bool setVersionInNewDatabase = !creationCallback;
- String errorMessage;
- RefPtr<DatabaseBackendBase> backend = openDatabaseBackend(context, DatabaseType::Sync, name,
- expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, error, errorMessage);
- if (!backend)
- return 0;
-
- RefPtr<DatabaseSync> database = DatabaseSync::create(context, backend);
-
- if (backend->isNew() && creationCallback.get()) {
- LOG(StorageAPI, "Invoking the creation callback for database %p\n", database.get());
- creationCallback->handleEvent(database.get());
- }
-
- ASSERT(database);
- return database.release();
-}
-
</del><span class="cx"> bool DatabaseManager::hasOpenDatabases(ScriptExecutionContext* context)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<DatabaseContext> databaseContext = existingDatabaseContextFor(context);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> static ExceptionCode exceptionCodeForDatabaseError(DatabaseError);
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Database> openDatabase(ScriptExecutionContext*, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback>, DatabaseError&);
</span><del>- PassRefPtr<DatabaseSync> openDatabaseSync(ScriptExecutionContext*, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback>, DatabaseError&);
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool hasOpenDatabases(ScriptExecutionContext*);
</span><span class="cx"> void stopDatabases(ScriptExecutionContext*, DatabaseTaskSynchronizer*);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseBackend.h"
</span><span class="cx"> #include "DatabaseBackendContext.h"
</span><del>-#include "DatabaseBackendSync.h"
-#include "DatabaseSync.h"
</del><span class="cx"> #include "DatabaseTracker.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -148,7 +146,8 @@
</span><span class="cx"> database = adoptRef(new Database(backendContext, name, expectedVersion, displayName, estimatedSize));
</span><span class="cx"> break;
</span><span class="cx"> case DatabaseType::Sync:
</span><del>- database = adoptRef(new DatabaseSync(backendContext, name, expectedVersion, displayName, estimatedSize));
</del><ins>+ // FIXME: Remove this case.
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMessage))
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseSynccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,174 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-#include "config.h"
-#include "DatabaseSync.h"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseBackendContext.h"
-#include "DatabaseBackendSync.h"
-#include "DatabaseCallback.h"
-#include "DatabaseContext.h"
-#include "DatabaseManager.h"
-#include "DatabaseTracker.h"
-#include "Logging.h"
-#include "SQLException.h"
-#include "SQLTransactionSync.h"
-#include "SQLTransactionSyncCallback.h"
-#include "ScriptExecutionContext.h"
-#include "SecurityOrigin.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/CString.h>
-
-namespace WebCore {
-
-PassRefPtr<DatabaseSync> DatabaseSync::create(ScriptExecutionContext*, PassRefPtr<DatabaseBackendBase> backend)
-{
- return static_cast<DatabaseSync*>(backend.get());
-}
-
-DatabaseSync::DatabaseSync(PassRefPtr<DatabaseBackendContext> databaseContext,
- const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBase(databaseContext->scriptExecutionContext())
- , DatabaseBackendSync(databaseContext, name, expectedVersion, displayName, estimatedSize)
-{
- setFrontend(this);
-}
-
-DatabaseSync::~DatabaseSync()
-{
- ASSERT(m_scriptExecutionContext->isContextThread());
-}
-
-PassRefPtr<DatabaseBackendSync> DatabaseSync::backend()
-{
- return this;
-}
-
-void DatabaseSync::changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionSyncCallback> changeVersionCallback, ExceptionCode& ec)
-{
- ASSERT(m_scriptExecutionContext->isContextThread());
-
- if (sqliteDatabase().transactionInProgress()) {
- setLastErrorMessage("unable to changeVersion from within a transaction");
- ec = SQLException::DATABASE_ERR;
- return;
- }
-
- RefPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, changeVersionCallback, false);
- if ((ec = transaction->begin())) {
- ASSERT(!lastErrorMessage().isEmpty());
- return;
- }
-
- String actualVersion;
- if (!getVersionFromDatabase(actualVersion)) {
- setLastErrorMessage("unable to read the current version", sqliteDatabase().lastError(), sqliteDatabase().lastErrorMsg());
- ec = SQLException::UNKNOWN_ERR;
- return;
- }
-
- if (actualVersion != oldVersion) {
- setLastErrorMessage("current version of the database and `oldVersion` argument do not match");
- ec = SQLException::VERSION_ERR;
- return;
- }
-
- if ((ec = transaction->execute())) {
- ASSERT(!lastErrorMessage().isEmpty());
- return;
- }
-
- if (!setVersionInDatabase(newVersion)) {
- setLastErrorMessage("unable to set the new version", sqliteDatabase().lastError(), sqliteDatabase().lastErrorMsg());
- ec = SQLException::UNKNOWN_ERR;
- return;
- }
-
- if ((ec = transaction->commit())) {
- ASSERT(!lastErrorMessage().isEmpty());
- setCachedVersion(oldVersion);
- return;
- }
-
- setExpectedVersion(newVersion);
- setLastErrorMessage("");
-}
-
-void DatabaseSync::transaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionCode& ec)
-{
- runTransaction(callback, false, ec);
-}
-
-void DatabaseSync::readTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionCode& ec)
-{
- runTransaction(callback, true, ec);
-}
-
-void DatabaseSync::runTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly, ExceptionCode& ec)
-{
- ASSERT(m_scriptExecutionContext->isContextThread());
-
- if (sqliteDatabase().transactionInProgress()) {
- setLastErrorMessage("unable to start a transaction from within a transaction");
- ec = SQLException::DATABASE_ERR;
- return;
- }
-
- RefPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, callback, readOnly);
- if ((ec = transaction->begin()) || (ec = transaction->execute()) || (ec = transaction->commit())) {
- ASSERT(!lastErrorMessage().isEmpty());
- transaction->rollback();
- }
-
- setLastErrorMessage("");
-}
-
-void DatabaseSync::markAsDeletedAndClose()
-{
- // FIXME: need to do something similar to closeImmediately(), but in a sync way
-}
-
-void DatabaseSync::closeImmediately()
-{
- ASSERT(m_scriptExecutionContext->isContextThread());
-
- if (!opened())
- return;
-
- logErrorMessage("forcibly closing database");
- closeDatabase();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseSynch"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,89 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 DatabaseSync_h
-#define DatabaseSync_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseBackendSync.h"
-#include "DatabaseBase.h"
-#include "DatabaseBasicTypes.h"
-#include <wtf/Forward.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class DatabaseCallback;
-class SQLTransactionSync;
-class SQLTransactionSyncCallback;
-
-// Instances of this class should be created and used only on the worker's context thread.
-class DatabaseSync : public DatabaseBase, public DatabaseBackendSync {
-public:
- virtual ~DatabaseSync();
-
- void changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionSyncCallback>, ExceptionCode&);
- void transaction(PassRefPtr<SQLTransactionSyncCallback>, ExceptionCode&);
- void readTransaction(PassRefPtr<SQLTransactionSyncCallback>, ExceptionCode&);
-
- virtual void markAsDeletedAndClose();
- virtual void closeImmediately();
-
- const String& lastErrorMessage() const { return m_lastErrorMessage; }
- void setLastErrorMessage(const String& message) { m_lastErrorMessage = message; }
- void setLastErrorMessage(const char* message, int sqliteCode)
- {
- setLastErrorMessage(String::format("%s (%d)", message, sqliteCode));
- }
- void setLastErrorMessage(const char* message, int sqliteCode, const char* sqliteMessage)
- {
- setLastErrorMessage(String::format("%s (%d, %s)", message, sqliteCode, sqliteMessage));
- }
-
-private:
- DatabaseSync(PassRefPtr<DatabaseBackendContext>, const String& name,
- const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
- PassRefPtr<DatabaseBackendSync> backend();
- static PassRefPtr<DatabaseSync> create(ScriptExecutionContext*, PassRefPtr<DatabaseBackendBase>);
-
- void runTransaction(PassRefPtr<SQLTransactionSyncCallback>, bool readOnly, ExceptionCode&);
-
- String m_lastErrorMessage;
-
- friend class DatabaseManager;
- friend class DatabaseServer; // FIXME: remove this when the backend has been split out.
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseSyncidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.idl (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.idl 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.idl 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-[
- NoInterfaceObject,
- Conditional=SQL_DATABASE,
-] interface DatabaseSync {
- readonly attribute DOMString version;
- readonly attribute DOMString lastErrorMessage;
- [RaisesException] void changeVersion(DOMString oldVersion, DOMString newVersion, optional SQLTransactionSyncCallback callback);
- [RaisesException] void transaction(SQLTransactionSyncCallback callback);
- [RaisesException] void readTransaction(SQLTransactionSyncCallback callback);
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementSynccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,137 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Google 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 "SQLStatementSync.h"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseSync.h"
-#include "SQLException.h"
-#include "SQLResultSet.h"
-#include "SQLValue.h"
-#include "SQLiteDatabase.h"
-#include "SQLiteStatement.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-SQLStatementSync::SQLStatementSync(const String& statement, const Vector<SQLValue>& arguments, int permissions)
- : m_statement(statement)
- , m_arguments(arguments)
- , m_permissions(permissions)
-{
- ASSERT(!m_statement.isEmpty());
-}
-
-PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionCode& ec)
-{
- db->setAuthorizerPermissions(m_permissions);
-
- SQLiteDatabase* database = &db->sqliteDatabase();
-
- SQLiteStatement statement(*database, m_statement);
- int result = statement.prepare();
- if (result != SQLResultOk) {
- ec = (result == SQLResultInterrupt ? SQLException::DATABASE_ERR : SQLException::SYNTAX_ERR);
- db->setLastErrorMessage("could not prepare statement", result, database->lastErrorMsg());
- return 0;
- }
-
- if (statement.bindParameterCount() != m_arguments.size()) {
- ec = (db->isInterrupted()? SQLException::DATABASE_ERR : SQLException::SYNTAX_ERR);
- db->setLastErrorMessage("number of '?'s in statement string does not match argument count");
- return 0;
- }
-
- for (unsigned i = 0; i < m_arguments.size(); ++i) {
- result = statement.bindValue(i + 1, m_arguments[i]);
- if (result == SQLResultFull) {
- ec = SQLException::QUOTA_ERR;
- db->setLastErrorMessage("there was not enough remaining storage space");
- return 0;
- }
-
- if (result != SQLResultOk) {
- ec = SQLException::DATABASE_ERR;
- db->setLastErrorMessage("could not bind value", result, database->lastErrorMsg());
- return 0;
- }
- }
-
- RefPtr<SQLResultSet> resultSet = SQLResultSet::create();
-
- // Step so we can fetch the column names.
- result = statement.step();
- if (result == SQLResultRow) {
- int columnCount = statement.columnCount();
- SQLResultSetRowList* rows = resultSet->rows();
-
- for (int i = 0; i < columnCount; i++)
- rows->addColumn(statement.getColumnName(i));
-
- do {
- for (int i = 0; i < columnCount; i++)
- rows->addResult(statement.getColumnValue(i));
-
- result = statement.step();
- } while (result == SQLResultRow);
-
- if (result != SQLResultDone) {
- ec = SQLException::DATABASE_ERR;
- db->setLastErrorMessage("could not iterate results", result, database->lastErrorMsg());
- return 0;
- }
- } else if (result == SQLResultDone) {
- // Didn't find anything, or was an insert.
- if (db->lastActionWasInsert())
- resultSet->setInsertId(database->lastInsertRowID());
- } else if (result == SQLResultFull) {
- // Quota error, the delegate will be asked for more space and this statement might be re-run.
- ec = SQLException::QUOTA_ERR;
- db->setLastErrorMessage("there was not enough remaining storage space");
- return 0;
- } else if (result == SQLResultConstraint) {
- ec = SQLException::CONSTRAINT_ERR;
- db->setLastErrorMessage("statement failed due to a constraint failure");
- return 0;
- } else {
- ec = SQLException::DATABASE_ERR;
- db->setLastErrorMessage("could not execute statement", result, database->lastErrorMsg());
- return 0;
- }
-
- resultSet->setRowsAffected(database->lastChanges());
- return resultSet.release();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLStatementSynch"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLStatementSync.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 SQLStatementSync_h
-#define SQLStatementSync_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseBasicTypes.h"
-#include "SQLValue.h"
-#include <wtf/Forward.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class DatabaseSync;
-class SQLResultSet;
-
-class SQLStatementSync {
-public:
- SQLStatementSync(const String& statement, const Vector<SQLValue>& arguments, int permissions);
-
- PassRefPtr<SQLResultSet> execute(DatabaseSync*, ExceptionCode&);
-
-private:
- String m_statement;
- Vector<SQLValue> m_arguments;
- int m_permissions;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif // SQLStatementSync_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendSynccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,237 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-#include "config.h"
-#include "SQLTransactionBackendSync.h"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseAuthorizer.h"
-#include "DatabaseBackendContext.h"
-#include "DatabaseSync.h"
-#include "SQLException.h"
-#include "SQLResultSet.h"
-#include "SQLStatementSync.h"
-#include "SQLTransactionClient.h"
-#include "SQLTransactionSync.h"
-#include "SQLTransactionSyncCallback.h"
-#include "SQLValue.h"
-#include "SQLiteTransaction.h"
-#include "ScriptExecutionContext.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-SQLTransactionBackendSync::SQLTransactionBackendSync(DatabaseSync* db, PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly)
- : m_database(db)
- , m_callback(callback)
- , m_readOnly(readOnly)
- , m_hasVersionMismatch(false)
- , m_modifiedDatabase(false)
- , m_transactionClient(std::make_unique<SQLTransactionClient>())
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
-}
-
-SQLTransactionBackendSync::~SQLTransactionBackendSync()
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
- if (m_sqliteTransaction && m_sqliteTransaction->inProgress())
- rollback();
-}
-
-PassRefPtr<SQLResultSet> SQLTransactionBackendSync::executeSQL(const String& sqlStatement, const Vector<SQLValue>& arguments, ExceptionCode& ec)
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
-
- m_database->setLastErrorMessage("");
-
- if (!m_database->opened()) {
- m_database->setLastErrorMessage("cannot executeSQL because the database is not open");
- ec = SQLException::UNKNOWN_ERR;
- return 0;
- }
-
- if (m_hasVersionMismatch) {
- m_database->setLastErrorMessage("cannot executeSQL because there is a version mismatch");
- ec = SQLException::VERSION_ERR;
- return 0;
- }
-
- if (sqlStatement.isEmpty())
- return 0;
-
- int permissions = DatabaseAuthorizer::ReadWriteMask;
- if (!m_database->databaseContext()->allowDatabaseAccess())
- permissions |= DatabaseAuthorizer::NoAccessMask;
- else if (m_readOnly)
- permissions |= DatabaseAuthorizer::ReadOnlyMask;
-
- SQLStatementSync statement(sqlStatement, arguments, permissions);
-
- m_database->resetAuthorizer();
- bool retryStatement = true;
- RefPtr<SQLResultSet> resultSet;
- while (retryStatement) {
- retryStatement = false;
- resultSet = statement.execute(m_database.get(), ec);
- if (!resultSet) {
- if (m_sqliteTransaction->wasRolledBackBySqlite())
- return 0;
-
- if (ec == SQLException::QUOTA_ERR) {
- if (m_transactionClient->didExceedQuota(database())) {
- ec = 0;
- retryStatement = true;
- } else {
- m_database->setLastErrorMessage("there was not enough remaining storage space");
- return 0;
- }
- }
- }
- }
-
- if (m_database->lastActionChangedDatabase())
- m_modifiedDatabase = true;
-
- return resultSet.release();
-}
-
-ExceptionCode SQLTransactionBackendSync::begin()
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
- if (!m_database->opened()) {
- m_database->setLastErrorMessage("cannot begin transaction because the database is not open");
- return SQLException::UNKNOWN_ERR;
- }
-
- ASSERT(!m_database->sqliteDatabase().transactionInProgress());
-
- // Set the maximum usage for this transaction if this transactions is not read-only.
- if (!m_readOnly)
- m_database->sqliteDatabase().setMaximumSize(m_database->maximumSize());
-
- ASSERT(!m_sqliteTransaction);
- m_sqliteTransaction = std::make_unique<SQLiteTransaction>(m_database->sqliteDatabase(), m_readOnly);
-
- m_database->resetDeletes();
- m_database->disableAuthorizer();
- m_sqliteTransaction->begin();
- m_database->enableAuthorizer();
-
- // Check if begin() succeeded.
- if (!m_sqliteTransaction->inProgress()) {
- ASSERT(!m_database->sqliteDatabase().transactionInProgress());
- m_database->setLastErrorMessage("unable to begin transaction",
- m_database->sqliteDatabase().lastError(), m_database->sqliteDatabase().lastErrorMsg());
- m_sqliteTransaction = nullptr;
- return SQLException::DATABASE_ERR;
- }
-
- // Note: We intentionally retrieve the actual version even with an empty expected version.
- // In multi-process browsers, we take this opportinutiy to update the cached value for
- // the actual version. In single-process browsers, this is just a map lookup.
- String actualVersion;
- if (!m_database->getActualVersionForTransaction(actualVersion)) {
- m_database->setLastErrorMessage("unable to read version",
- m_database->sqliteDatabase().lastError(), m_database->sqliteDatabase().lastErrorMsg());
- rollback();
- return SQLException::DATABASE_ERR;
- }
- m_hasVersionMismatch = !m_database->expectedVersion().isEmpty() && (m_database->expectedVersion() != actualVersion);
- return 0;
-}
-
-ExceptionCode SQLTransactionBackendSync::execute()
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
- if (!m_database->opened() || (m_callback && !m_callback->handleEvent(SQLTransactionSync::from(this)))) {
- if (m_database->lastErrorMessage().isEmpty())
- m_database->setLastErrorMessage("failed to execute transaction callback");
- m_callback = 0;
- return SQLException::UNKNOWN_ERR;
- }
-
- m_callback = 0;
- return 0;
-}
-
-ExceptionCode SQLTransactionBackendSync::commit()
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
- if (!m_database->opened()) {
- m_database->setLastErrorMessage("unable to commit transaction because the database is not open.");
- return SQLException::UNKNOWN_ERR;
- }
-
- ASSERT(m_sqliteTransaction);
-
- m_database->disableAuthorizer();
- m_sqliteTransaction->commit();
- m_database->enableAuthorizer();
-
- // If the commit failed, the transaction will still be marked as "in progress"
- if (m_sqliteTransaction->inProgress()) {
- m_database->setLastErrorMessage("unable to commit transaction",
- m_database->sqliteDatabase().lastError(), m_database->sqliteDatabase().lastErrorMsg());
- return SQLException::DATABASE_ERR;
- }
-
- m_sqliteTransaction = nullptr;
-
- // Vacuum the database if anything was deleted.
- if (m_database->hadDeletes())
- m_database->incrementalVacuumIfNeeded();
-
- // The commit was successful. If the transaction modified this database, notify the delegates.
- if (m_modifiedDatabase)
- m_transactionClient->didCommitWriteTransaction(database());
- return 0;
-}
-
-void SQLTransactionBackendSync::rollback()
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
- m_database->disableAuthorizer();
- if (m_sqliteTransaction) {
- m_sqliteTransaction->rollback();
- m_sqliteTransaction = nullptr;
- }
- m_database->enableAuthorizer();
-
- ASSERT(!m_database->sqliteDatabase().transactionInProgress());
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionBackendSynch"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionBackendSync.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 SQLTransactionBackendSync_h
-#define SQLTransactionBackendSync_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseBasicTypes.h"
-#include <memory>
-#include <wtf/Forward.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class DatabaseSync;
-class SQLResultSet;
-class SQLTransactionClient;
-class SQLTransactionSyncCallback;
-class SQLValue;
-class SQLiteTransaction;
-
-// Instances of this class should be created and used only on the worker's context thread.
-class SQLTransactionBackendSync : public RefCounted<SQLTransactionBackendSync> {
-public:
- ~SQLTransactionBackendSync();
-
- PassRefPtr<SQLResultSet> executeSQL(const String& sqlStatement, const Vector<SQLValue>& arguments, ExceptionCode&);
-
- DatabaseSync* database() { return m_database.get(); }
- bool isReadOnly() const { return m_readOnly; }
-
- ExceptionCode begin();
- ExceptionCode execute();
- ExceptionCode commit();
- void rollback();
-
-private:
- SQLTransactionBackendSync(DatabaseSync*, PassRefPtr<SQLTransactionSyncCallback>, bool readOnly);
-
- RefPtr<DatabaseSync> m_database;
- RefPtr<SQLTransactionSyncCallback> m_callback;
- bool m_readOnly;
- bool m_hasVersionMismatch;
-
- bool m_modifiedDatabase;
- std::unique_ptr<SQLTransactionClient> m_transactionClient;
- std::unique_ptr<SQLiteTransaction> m_sqliteTransaction;
-
- friend class SQLTransactionSync; // FIXME: Remove this once the front-end has been properly isolated.
-};
-
-} // namespace WebCore
-
-#endif
-
-#endif // SQLTransactionBackendSync_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionSynccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-#include "config.h"
-#include "SQLTransactionSync.h"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "DatabaseSync.h"
-#include "SQLTransactionSyncCallback.h"
-#include "ScriptExecutionContext.h"
-
-namespace WebCore {
-
-PassRefPtr<SQLTransactionSync> SQLTransactionSync::create(DatabaseSync* db, PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly)
-{
- return adoptRef(new SQLTransactionSync(db, callback, readOnly));
-}
-
-SQLTransactionSync::SQLTransactionSync(DatabaseSync* db, PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly)
- : SQLTransactionBackendSync(db, callback, readOnly)
-{
- ASSERT(m_database->scriptExecutionContext()->isContextThread());
-}
-
-SQLTransactionSync* SQLTransactionSync::from(SQLTransactionBackendSync* backend)
-{
- return static_cast<SQLTransactionSync*>(backend);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionSynch"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 SQLTransactionSync_h
-#define SQLTransactionSync_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include "SQLTransactionBackendSync.h"
-
-namespace WebCore {
-
-// Instances of this class should be created and used only on the worker's context thread.
-class SQLTransactionSync : public SQLTransactionBackendSync {
-public:
- static PassRefPtr<SQLTransactionSync> create(DatabaseSync*, PassRefPtr<SQLTransactionSyncCallback>, bool readOnly = false);
-
- static SQLTransactionSync* from(SQLTransactionBackendSync*);
-
-private:
- SQLTransactionSync(DatabaseSync*, PassRefPtr<SQLTransactionSyncCallback>, bool readOnly);
-};
-
-} // namespace WebCore
-
-#endif
-
-#endif // SQLTransactionSync_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionSyncidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.idl (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.idl 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSync.idl 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-[
- NoInterfaceObject,
- Conditional=SQL_DATABASE,
- ImplementationLacksVTable,
-] interface SQLTransactionSync {
- [Custom] SQLResultSet executeSql(DOMString sqlStatement, ObjectArray arguments);
-};
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionSyncCallbackh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.h (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.h 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.h 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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 SQLTransactionSyncCallback_h
-#define SQLTransactionSyncCallback_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class SQLTransactionSync;
-
-// Instances of this class should be created and used only on the worker's context thread.
-class SQLTransactionSyncCallback : public RefCounted<SQLTransactionSyncCallback> {
-public:
- virtual ~SQLTransactionSyncCallback() { }
- virtual bool handleEvent(SQLTransactionSync*) = 0;
-};
-
-}
-
-#endif
-
-#endif // SQLTransactionSyncCallback_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionSyncCallbackidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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.
- */
-
-[
- Conditional=SQL_DATABASE,
-] callback interface SQLTransactionSyncCallback {
- boolean handleEvent(SQLTransactionSync transaction);
-};
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1379,20 +1379,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -4025,20 +4011,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSSQLTransactionSync.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSStorage.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -6800,12 +6772,10 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBackendContext.cpp" />
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseBackendSync.cpp" />
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBase.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseContext.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseManager.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseServer.cpp" />
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseSync.cpp" />
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseTask.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseThread.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseTracker.cpp" />
</span><span class="lines">@@ -6816,14 +6786,11 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLResultSetRowList.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLStatement.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLStatementBackend.cpp" />
</span><del>- <ClCompile Include="..\Modules\webdatabase\SQLStatementSync.cpp" />
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransaction.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransactionBackend.cpp" />
</span><del>- <ClCompile Include="..\Modules\webdatabase\SQLTransactionBackendSync.cpp" />
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransactionClient.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransactionCoordinator.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransactionStateMachine.cpp" />
</span><del>- <ClCompile Include="..\Modules\webdatabase\SQLTransactionSync.cpp" />
</del><span class="cx"> <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannel.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\websockets\WebSocket.cpp" />
</span><span class="lines">@@ -17354,20 +17321,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSSQLTransactionSyncCustom.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bindings\js\JSRTCIceCandidateCustom.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -18377,7 +18330,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSValueList.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCustomEvent.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabase.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h" />
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItemList.h" />
</span><span class="lines">@@ -18578,7 +18530,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSQLResultSet.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSQLResultSetRowList.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSSQLTransaction.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSSQLTransactionSync.h" />
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSStorage.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSStorageEvent.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSStorageInfo.h" />
</span><span class="lines">@@ -19090,7 +19041,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseError.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseManager.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseServer.h" />
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseSync.h" />
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseTask.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseThread.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseTracker.h" />
</span><span class="lines">@@ -19115,8 +19065,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransactionErrorCallback.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransactionState.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransactionStateMachine.h" />
</span><del>- <ClInclude Include="..\Modules\webdatabase\SQLTransactionSync.h" />
- <ClInclude Include="..\Modules\webdatabase\SQLTransactionSyncCallback.h" />
</del><span class="cx"> <ClInclude Include="..\Modules\websockets\CloseEvent.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\websockets\ThreadableWebSocketChannel.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -477,9 +477,6 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBackendContext.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseBackendSync.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseBase.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -492,9 +489,6 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseServer.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseSync.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseTask.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -525,18 +519,12 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLStatementBackend.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\Modules\webdatabase\SQLStatementSync.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransaction.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransactionBackend.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\Modules\webdatabase\SQLTransactionBackendSync.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransactionClient.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -546,9 +534,6 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\SQLTransactionStateMachine.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\Modules\webdatabase\SQLTransactionSync.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannel.cpp">
</span><span class="cx"> <Filter>Modules\websockets</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4464,9 +4449,6 @@
</span><span class="cx"> <ClCompile Include="..\bindings\js\JSSQLTransactionCustom.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSSQLTransactionSyncCustom.cpp">
- <Filter>bindings\js</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bindings\js\JSRTCIceCandidateCustom.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -5290,9 +5272,6 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabase.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.cpp">
- <Filter>DerivedSources</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -5833,9 +5812,6 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSSQLTransaction.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSSQLTransactionSync.cpp">
- <Filter>DerivedSources</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSStorage.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7425,9 +7401,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBackendContext.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseBackendSync.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBase.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -7449,9 +7422,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseServer.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseSync.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseTask.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -7494,18 +7464,12 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLStatementErrorCallback.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\Modules\webdatabase\SQLStatementSync.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransaction.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransactionBackend.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\Modules\webdatabase\SQLTransactionBackendSync.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransactionCallback.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -7524,12 +7488,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\SQLTransactionStateMachine.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\Modules\webdatabase\SQLTransactionSync.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
- <ClInclude Include="..\Modules\webdatabase\SQLTransactionSyncCallback.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\Modules\websockets\CloseEvent.h">
</span><span class="cx"> <Filter>Modules\websockets</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -13211,9 +13169,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabase.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -13748,9 +13703,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSSQLTransaction.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSSQLTransactionSync.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSStorage.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -3606,8 +3606,6 @@
</span><span class="cx"> 97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69E51505F081001B74AC /* DatabaseContext.cpp */; };
</span><span class="cx"> 97BC6A281505F081001B74AC /* DatabaseContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E61505F081001B74AC /* DatabaseContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 97BC6A291505F081001B74AC /* DatabaseDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E71505F081001B74AC /* DatabaseDetails.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 97BC6A2A1505F081001B74AC /* DatabaseSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69E81505F081001B74AC /* DatabaseSync.cpp */; };
- 97BC6A2B1505F081001B74AC /* DatabaseSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E91505F081001B74AC /* DatabaseSync.h */; };
</del><span class="cx"> 97BC6A2D1505F081001B74AC /* DatabaseTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69EB1505F081001B74AC /* DatabaseTask.cpp */; };
</span><span class="cx"> 97BC6A2E1505F081001B74AC /* DatabaseTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69EC1505F081001B74AC /* DatabaseTask.h */; };
</span><span class="cx"> 97BC6A2F1505F081001B74AC /* DatabaseThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69ED1505F081001B74AC /* DatabaseThread.cpp */; };
</span><span class="lines">@@ -3627,8 +3625,6 @@
</span><span class="cx"> 97BC6A481505F081001B74AC /* SQLStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A061505F081001B74AC /* SQLStatement.h */; };
</span><span class="cx"> 97BC6A491505F081001B74AC /* SQLStatementCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A071505F081001B74AC /* SQLStatementCallback.h */; };
</span><span class="cx"> 97BC6A4B1505F081001B74AC /* SQLStatementErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A091505F081001B74AC /* SQLStatementErrorCallback.h */; };
</span><del>- 97BC6A4D1505F081001B74AC /* SQLStatementSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A0B1505F081001B74AC /* SQLStatementSync.cpp */; };
- 97BC6A4E1505F081001B74AC /* SQLStatementSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A0C1505F081001B74AC /* SQLStatementSync.h */; };
</del><span class="cx"> 97BC6A4F1505F081001B74AC /* SQLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A0D1505F081001B74AC /* SQLTransaction.cpp */; };
</span><span class="cx"> 97BC6A501505F081001B74AC /* SQLTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A0E1505F081001B74AC /* SQLTransaction.h */; };
</span><span class="cx"> 97BC6A521505F081001B74AC /* SQLTransactionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A101505F081001B74AC /* SQLTransactionCallback.h */; };
</span><span class="lines">@@ -3637,9 +3633,6 @@
</span><span class="cx"> 97BC6A561505F081001B74AC /* SQLTransactionCoordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A141505F081001B74AC /* SQLTransactionCoordinator.cpp */; };
</span><span class="cx"> 97BC6A571505F081001B74AC /* SQLTransactionCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A151505F081001B74AC /* SQLTransactionCoordinator.h */; };
</span><span class="cx"> 97BC6A581505F081001B74AC /* SQLTransactionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A161505F081001B74AC /* SQLTransactionErrorCallback.h */; };
</span><del>- 97BC6A5A1505F081001B74AC /* SQLTransactionSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A181505F081001B74AC /* SQLTransactionSync.cpp */; };
- 97BC6A5B1505F081001B74AC /* SQLTransactionSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A191505F081001B74AC /* SQLTransactionSync.h */; };
- 97BC6A5D1505F081001B74AC /* SQLTransactionSyncCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A1B1505F081001B74AC /* SQLTransactionSyncCallback.h */; };
</del><span class="cx"> 97BC84831236FD93000C6161 /* TextDocumentParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC84811236FD93000C6161 /* TextDocumentParser.cpp */; };
</span><span class="cx"> 97BC84841236FD93000C6161 /* TextDocumentParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC84821236FD93000C6161 /* TextDocumentParser.h */; };
</span><span class="cx"> 97BC849B12370A4B000C6161 /* HTMLInputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC849A12370A4B000C6161 /* HTMLInputStream.h */; };
</span><span class="lines">@@ -4982,19 +4975,12 @@
</span><span class="cx"> B5320D6B122A24E9002D1440 /* FontPlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = B5320D69122A24E9002D1440 /* FontPlatformData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B5320D6C122A24E9002D1440 /* FontPlatformDataCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5320D6A122A24E9002D1440 /* FontPlatformDataCocoa.mm */; };
</span><span class="cx"> B543B85717EB758F003BE93A /* SVGPropertyInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B543B85617EB758F003BE93A /* SVGPropertyInfo.cpp */; };
</span><del>- B55D5AA4119131FC00BCC315 /* JSSQLTransactionSyncCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B55D5AA2119131FC00BCC315 /* JSSQLTransactionSyncCallback.h */; };
- B55D5AA5119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55D5AA3119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp */; };
- B55D5AA91191325000BCC315 /* JSSQLTransactionSyncCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55D5AA71191325000BCC315 /* JSSQLTransactionSyncCustom.cpp */; };
</del><span class="cx"> B562DB6017D3CD630010AF96 /* HTMLElementTypeHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = B562DB5E17D3CD560010AF96 /* HTMLElementTypeHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B562DB6117D3CD660010AF96 /* SVGElementTypeHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = B562DB5F17D3CD560010AF96 /* SVGElementTypeHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B56576E817DA94E200A56BDC /* DOMConstructorWithDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = B56576E717DA94E200A56BDC /* DOMConstructorWithDocument.h */; };
</span><span class="cx"> B56579B51824D12A00E79F23 /* RenderChildIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = B56579B41824D12A00E79F23 /* RenderChildIterator.h */; };
</span><span class="cx"> B57CB52D182A3EED0079A647 /* InlineElementBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B57CB52C182A3EED0079A647 /* InlineElementBox.cpp */; };
</span><span class="cx"> B57CB52E182A3EFC0079A647 /* InlineElementBox.h in Headers */ = {isa = PBXBuildFile; fileRef = B57CB52B182A37F60079A647 /* InlineElementBox.h */; };
</span><del>- B58CEB6911913607002A6790 /* JSDatabaseSync.h in Headers */ = {isa = PBXBuildFile; fileRef = B58CEB6711913607002A6790 /* JSDatabaseSync.h */; };
- B58CEB6A11913607002A6790 /* JSDatabaseSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B58CEB6811913607002A6790 /* JSDatabaseSync.cpp */; };
- B58CEB6D1191361C002A6790 /* JSSQLTransactionSync.h in Headers */ = {isa = PBXBuildFile; fileRef = B58CEB6B1191361C002A6790 /* JSSQLTransactionSync.h */; };
- B58CEB6E1191361C002A6790 /* JSSQLTransactionSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B58CEB6C1191361C002A6790 /* JSSQLTransactionSync.cpp */; };
</del><span class="cx"> B595FF471824CEE300FF51CD /* RenderIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = B595FF461824CEE300FF51CD /* RenderIterator.h */; };
</span><span class="cx"> B59DD699119029E5007E9684 /* JSDatabaseCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B59DD697119029E5007E9684 /* JSDatabaseCallback.h */; };
</span><span class="cx"> B59DD69A119029E5007E9684 /* JSDatabaseCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B59DD698119029E5007E9684 /* JSDatabaseCallback.cpp */; };
</span><span class="lines">@@ -6673,8 +6659,6 @@
</span><span class="cx"> FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */ = {isa = PBXBuildFile; fileRef = FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */; };
</span><span class="cx"> FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- FE16CFD5169D1DED00D3A0C7 /* DatabaseBackendSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE16CFD1169D1DEC00D3A0C7 /* DatabaseBackendSync.cpp */; };
- FE16CFD6169D1DED00D3A0C7 /* DatabaseBackendSync.h in Headers */ = {isa = PBXBuildFile; fileRef = FE16CFD2169D1DEC00D3A0C7 /* DatabaseBackendSync.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */ = {isa = PBXBuildFile; fileRef = FE36FD1116C7826400F887C1 /* ChangeVersionData.h */; };
</span><span class="cx"> FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */; };
</span><span class="lines">@@ -6700,8 +6684,6 @@
</span><span class="cx"> FE8A674816CDD19E00930BF8 /* SQLStatementBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FE8A674616CDD19E00930BF8 /* SQLStatementBackend.h */; };
</span><span class="cx"> FE9E89FB16E2DC0500A908F8 /* OriginLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE9E89F916E2DC0400A908F8 /* OriginLock.cpp */; };
</span><span class="cx"> FE9E89FC16E2DC0500A908F8 /* OriginLock.h in Headers */ = {isa = PBXBuildFile; fileRef = FE9E89FA16E2DC0400A908F8 /* OriginLock.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- FEAD7D8716C339EE00D4670B /* SQLTransactionBackendSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEAD7D8516C339EE00D4670B /* SQLTransactionBackendSync.cpp */; };
- FEAD7D8816C339EE00D4670B /* SQLTransactionBackendSync.h in Headers */ = {isa = PBXBuildFile; fileRef = FEAD7D8616C339EE00D4670B /* SQLTransactionBackendSync.h */; };
</del><span class="cx"> FEAF6654167970320062D0C5 /* DatabaseServer.h in Headers */ = {isa = PBXBuildFile; fileRef = FEAF6653167970070062D0C5 /* DatabaseServer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FEB26D28167A8F2A00FDD26B /* DatabaseServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEB26D27167A8F2A00FDD26B /* DatabaseServer.cpp */; };
</span><span class="cx"> FEBC5F3116BD0CC300659BD3 /* DatabaseBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */; };
</span><span class="lines">@@ -10798,9 +10780,6 @@
</span><span class="cx"> 97BC69E51505F081001B74AC /* DatabaseContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseContext.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 97BC69E61505F081001B74AC /* DatabaseContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseContext.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC69E71505F081001B74AC /* DatabaseDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseDetails.h; sourceTree = "<group>"; };
</span><del>- 97BC69E81505F081001B74AC /* DatabaseSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseSync.cpp; sourceTree = "<group>"; };
- 97BC69E91505F081001B74AC /* DatabaseSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseSync.h; sourceTree = "<group>"; };
- 97BC69EA1505F081001B74AC /* DatabaseSync.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DatabaseSync.idl; sourceTree = "<group>"; };
</del><span class="cx"> 97BC69EB1505F081001B74AC /* DatabaseTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseTask.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 97BC69EC1505F081001B74AC /* DatabaseTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseTask.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC69ED1505F081001B74AC /* DatabaseThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseThread.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -10826,8 +10805,6 @@
</span><span class="cx"> 97BC6A081505F081001B74AC /* SQLStatementCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLStatementCallback.idl; sourceTree = "<group>"; };
</span><span class="cx"> 97BC6A091505F081001B74AC /* SQLStatementErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLStatementErrorCallback.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC6A0A1505F081001B74AC /* SQLStatementErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLStatementErrorCallback.idl; sourceTree = "<group>"; };
</span><del>- 97BC6A0B1505F081001B74AC /* SQLStatementSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLStatementSync.cpp; sourceTree = "<group>"; };
- 97BC6A0C1505F081001B74AC /* SQLStatementSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLStatementSync.h; sourceTree = "<group>"; };
</del><span class="cx"> 97BC6A0D1505F081001B74AC /* SQLTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransaction.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 97BC6A0E1505F081001B74AC /* SQLTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransaction.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC6A0F1505F081001B74AC /* SQLTransaction.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLTransaction.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -10839,11 +10816,6 @@
</span><span class="cx"> 97BC6A151505F081001B74AC /* SQLTransactionCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionCoordinator.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC6A161505F081001B74AC /* SQLTransactionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionErrorCallback.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC6A171505F081001B74AC /* SQLTransactionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLTransactionErrorCallback.idl; sourceTree = "<group>"; };
</span><del>- 97BC6A181505F081001B74AC /* SQLTransactionSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionSync.cpp; sourceTree = "<group>"; };
- 97BC6A191505F081001B74AC /* SQLTransactionSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionSync.h; sourceTree = "<group>"; };
- 97BC6A1A1505F081001B74AC /* SQLTransactionSync.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLTransactionSync.idl; sourceTree = "<group>"; };
- 97BC6A1B1505F081001B74AC /* SQLTransactionSyncCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionSyncCallback.h; sourceTree = "<group>"; };
- 97BC6A1C1505F081001B74AC /* SQLTransactionSyncCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLTransactionSyncCallback.idl; sourceTree = "<group>"; };
</del><span class="cx"> 97BC84811236FD93000C6161 /* TextDocumentParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextDocumentParser.cpp; path = parser/TextDocumentParser.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 97BC84821236FD93000C6161 /* TextDocumentParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDocumentParser.h; path = parser/TextDocumentParser.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC849A12370A4B000C6161 /* HTMLInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLInputStream.h; path = parser/HTMLInputStream.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -12402,9 +12374,6 @@
</span><span class="cx"> B5320D69122A24E9002D1440 /* FontPlatformData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontPlatformData.h; sourceTree = "<group>"; };
</span><span class="cx"> B5320D6A122A24E9002D1440 /* FontPlatformDataCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FontPlatformDataCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> B543B85617EB758F003BE93A /* SVGPropertyInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPropertyInfo.cpp; sourceTree = "<group>"; };
</span><del>- B55D5AA2119131FC00BCC315 /* JSSQLTransactionSyncCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLTransactionSyncCallback.h; sourceTree = "<group>"; };
- B55D5AA3119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransactionSyncCallback.cpp; sourceTree = "<group>"; };
- B55D5AA71191325000BCC315 /* JSSQLTransactionSyncCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransactionSyncCustom.cpp; sourceTree = "<group>"; };
</del><span class="cx"> B562DB5E17D3CD560010AF96 /* HTMLElementTypeHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HTMLElementTypeHelpers.h; sourceTree = "<group>"; };
</span><span class="cx"> B562DB5F17D3CD560010AF96 /* SVGElementTypeHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGElementTypeHelpers.h; sourceTree = "<group>"; };
</span><span class="cx"> B56576E417DA599F00A56BDC /* JSMainThreadExecStateInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecStateInstrumentation.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -12412,10 +12381,6 @@
</span><span class="cx"> B56579B41824D12A00E79F23 /* RenderChildIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderChildIterator.h; sourceTree = "<group>"; };
</span><span class="cx"> B57CB52B182A37F60079A647 /* InlineElementBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineElementBox.h; sourceTree = "<group>"; };
</span><span class="cx"> B57CB52C182A3EED0079A647 /* InlineElementBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InlineElementBox.cpp; sourceTree = "<group>"; };
</span><del>- B58CEB6711913607002A6790 /* JSDatabaseSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabaseSync.h; sourceTree = "<group>"; };
- B58CEB6811913607002A6790 /* JSDatabaseSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabaseSync.cpp; sourceTree = "<group>"; };
- B58CEB6B1191361C002A6790 /* JSSQLTransactionSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLTransactionSync.h; sourceTree = "<group>"; };
- B58CEB6C1191361C002A6790 /* JSSQLTransactionSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLTransactionSync.cpp; sourceTree = "<group>"; };
</del><span class="cx"> B595FF461824CEE300FF51CD /* RenderIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderIterator.h; sourceTree = "<group>"; };
</span><span class="cx"> B59DD697119029E5007E9684 /* JSDatabaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabaseCallback.h; sourceTree = "<group>"; };
</span><span class="cx"> B59DD698119029E5007E9684 /* JSDatabaseCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabaseCallback.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14286,8 +14251,6 @@
</span><span class="cx"> FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractDatabaseServer.h; sourceTree = "<group>"; };
</span><span class="cx"> FE16CFCF169D1DEC00D3A0C7 /* DatabaseBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBackend.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE16CFD0169D1DEC00D3A0C7 /* DatabaseBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBackend.h; sourceTree = "<group>"; };
</span><del>- FE16CFD1169D1DEC00D3A0C7 /* DatabaseBackendSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBackendSync.cpp; sourceTree = "<group>"; };
- FE16CFD2169D1DEC00D3A0C7 /* DatabaseBackendSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBackendSync.h; sourceTree = "<group>"; };
</del><span class="cx"> FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBasicTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> FE36FD1116C7826400F887C1 /* ChangeVersionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeVersionData.h; sourceTree = "<group>"; };
</span><span class="cx"> FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionStateMachine.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14313,8 +14276,6 @@
</span><span class="cx"> FE8A674616CDD19E00930BF8 /* SQLStatementBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLStatementBackend.h; sourceTree = "<group>"; };
</span><span class="cx"> FE9E89F916E2DC0400A908F8 /* OriginLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OriginLock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE9E89FA16E2DC0400A908F8 /* OriginLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OriginLock.h; sourceTree = "<group>"; };
</span><del>- FEAD7D8516C339EE00D4670B /* SQLTransactionBackendSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionBackendSync.cpp; sourceTree = "<group>"; };
- FEAD7D8616C339EE00D4670B /* SQLTransactionBackendSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionBackendSync.h; sourceTree = "<group>"; };
</del><span class="cx"> FEAF6653167970070062D0C5 /* DatabaseServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseServer.h; sourceTree = "<group>"; };
</span><span class="cx"> FEB26D27167A8F2A00FDD26B /* DatabaseServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseServer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBase.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -18359,8 +18320,6 @@
</span><span class="cx"> 97BC69D71505F076001B74AC /* DatabaseBackendBase.h */,
</span><span class="cx"> FE6F6AAD169E057500FC30A2 /* DatabaseBackendContext.cpp */,
</span><span class="cx"> FE6F6AAE169E057500FC30A2 /* DatabaseBackendContext.h */,
</span><del>- FE16CFD1169D1DEC00D3A0C7 /* DatabaseBackendSync.cpp */,
- FE16CFD2169D1DEC00D3A0C7 /* DatabaseBackendSync.h */,
</del><span class="cx"> FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */,
</span><span class="cx"> FEBC5F3016BD0CC300659BD3 /* DatabaseBase.h */,
</span><span class="cx"> FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */,
</span><span class="lines">@@ -18375,9 +18334,6 @@
</span><span class="cx"> 97BC69F11505F081001B74AC /* DatabaseManagerClient.h */,
</span><span class="cx"> FEB26D27167A8F2A00FDD26B /* DatabaseServer.cpp */,
</span><span class="cx"> FEAF6653167970070062D0C5 /* DatabaseServer.h */,
</span><del>- 97BC69E81505F081001B74AC /* DatabaseSync.cpp */,
- 97BC69E91505F081001B74AC /* DatabaseSync.h */,
- 97BC69EA1505F081001B74AC /* DatabaseSync.idl */,
</del><span class="cx"> 97BC69EB1505F081001B74AC /* DatabaseTask.cpp */,
</span><span class="cx"> 97BC69EC1505F081001B74AC /* DatabaseTask.h */,
</span><span class="cx"> 97BC69ED1505F081001B74AC /* DatabaseThread.cpp */,
</span><span class="lines">@@ -18409,15 +18365,11 @@
</span><span class="cx"> 97BC6A081505F081001B74AC /* SQLStatementCallback.idl */,
</span><span class="cx"> 97BC6A091505F081001B74AC /* SQLStatementErrorCallback.h */,
</span><span class="cx"> 97BC6A0A1505F081001B74AC /* SQLStatementErrorCallback.idl */,
</span><del>- 97BC6A0B1505F081001B74AC /* SQLStatementSync.cpp */,
- 97BC6A0C1505F081001B74AC /* SQLStatementSync.h */,
</del><span class="cx"> 97BC6A0D1505F081001B74AC /* SQLTransaction.cpp */,
</span><span class="cx"> 97BC6A0E1505F081001B74AC /* SQLTransaction.h */,
</span><span class="cx"> 97BC6A0F1505F081001B74AC /* SQLTransaction.idl */,
</span><span class="cx"> FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */,
</span><span class="cx"> FEE1811216C319E800084849 /* SQLTransactionBackend.h */,
</span><del>- FEAD7D8516C339EE00D4670B /* SQLTransactionBackendSync.cpp */,
- FEAD7D8616C339EE00D4670B /* SQLTransactionBackendSync.h */,
</del><span class="cx"> 97BC6A101505F081001B74AC /* SQLTransactionCallback.h */,
</span><span class="cx"> 97BC6A111505F081001B74AC /* SQLTransactionCallback.idl */,
</span><span class="cx"> 97BC6A121505F081001B74AC /* SQLTransactionClient.cpp */,
</span><span class="lines">@@ -18429,11 +18381,6 @@
</span><span class="cx"> FE36FD1416C7826400F887C1 /* SQLTransactionState.h */,
</span><span class="cx"> FE36FD1216C7826400F887C1 /* SQLTransactionStateMachine.cpp */,
</span><span class="cx"> FE36FD1316C7826400F887C1 /* SQLTransactionStateMachine.h */,
</span><del>- 97BC6A181505F081001B74AC /* SQLTransactionSync.cpp */,
- 97BC6A191505F081001B74AC /* SQLTransactionSync.h */,
- 97BC6A1A1505F081001B74AC /* SQLTransactionSync.idl */,
- 97BC6A1B1505F081001B74AC /* SQLTransactionSyncCallback.h */,
- 97BC6A1C1505F081001B74AC /* SQLTransactionSyncCallback.idl */,
</del><span class="cx"> );
</span><span class="cx"> path = webdatabase;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -19573,8 +19520,6 @@
</span><span class="cx"> 1AE82F8E0CAAFA9D002237AE /* JSDatabase.h */,
</span><span class="cx"> B59DD698119029E5007E9684 /* JSDatabaseCallback.cpp */,
</span><span class="cx"> B59DD697119029E5007E9684 /* JSDatabaseCallback.h */,
</span><del>- B58CEB6811913607002A6790 /* JSDatabaseSync.cpp */,
- B58CEB6711913607002A6790 /* JSDatabaseSync.h */,
</del><span class="cx"> 511EF2A817F0FC4800E4FA16 /* JSIDBAny.cpp */,
</span><span class="cx"> C585A66511D4FB07004C3E4B /* JSIDBAny.h */,
</span><span class="cx"> 511EF2A917F0FC4800E4FA16 /* JSIDBCursor.cpp */,
</span><span class="lines">@@ -19617,10 +19562,6 @@
</span><span class="cx"> B59DD69B11902A42007E9684 /* JSSQLTransactionCallback.h */,
</span><span class="cx"> B59DD6A011902A52007E9684 /* JSSQLTransactionErrorCallback.cpp */,
</span><span class="cx"> B59DD69F11902A52007E9684 /* JSSQLTransactionErrorCallback.h */,
</span><del>- B58CEB6C1191361C002A6790 /* JSSQLTransactionSync.cpp */,
- B58CEB6B1191361C002A6790 /* JSSQLTransactionSync.h */,
- B55D5AA3119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp */,
- B55D5AA2119131FC00BCC315 /* JSSQLTransactionSyncCallback.h */,
</del><span class="cx"> 51E3F9D40DA05E1D00250911 /* JSStorage.cpp */,
</span><span class="cx"> 51E3F9D50DA05E1D00250911 /* JSStorage.h */,
</span><span class="cx"> 51E0BAE80DA55D4A00A9E417 /* JSStorageEvent.cpp */,
</span><span class="lines">@@ -21105,7 +21046,6 @@
</span><span class="cx"> 07DC5FD317D3EEE90099F890 /* JSRTCStatsResponseCustom.cpp */,
</span><span class="cx"> 51DCE8010CAC9F1C00488358 /* JSSQLResultSetRowListCustom.cpp */,
</span><span class="cx"> 1AD2316D0CD269E700C1F194 /* JSSQLTransactionCustom.cpp */,
</span><del>- B55D5AA71191325000BCC315 /* JSSQLTransactionSyncCustom.cpp */,
</del><span class="cx"> 51D0C5150DAA90B7003B3831 /* JSStorageCustom.cpp */,
</span><span class="cx"> BC98A27C0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp */,
</span><span class="cx"> AD726FEC16D9F4B9003A4E6D /* JSStyleSheetCustom.h */,
</span><span class="lines">@@ -23867,7 +23807,6 @@
</span><span class="cx"> FE16CFD4169D1DED00D3A0C7 /* DatabaseBackend.h in Headers */,
</span><span class="cx"> 97BC69DB1505F076001B74AC /* DatabaseBackendBase.h in Headers */,
</span><span class="cx"> FE6F6AB0169E057500FC30A2 /* DatabaseBackendContext.h in Headers */,
</span><del>- FE16CFD6169D1DED00D3A0C7 /* DatabaseBackendSync.h in Headers */,
</del><span class="cx"> FEBC5F3216BD0CC300659BD3 /* DatabaseBase.h in Headers */,
</span><span class="cx"> FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */,
</span><span class="cx"> 97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */,
</span><span class="lines">@@ -23878,7 +23817,6 @@
</span><span class="cx"> 97BC6A331505F081001B74AC /* DatabaseManagerClient.h in Headers */,
</span><span class="cx"> FEAF6654167970320062D0C5 /* DatabaseServer.h in Headers */,
</span><span class="cx"> FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */,
</span><del>- 97BC6A2B1505F081001B74AC /* DatabaseSync.h in Headers */,
</del><span class="cx"> 97BC6A2E1505F081001B74AC /* DatabaseTask.h in Headers */,
</span><span class="cx"> 97BC6A301505F081001B74AC /* DatabaseThread.h in Headers */,
</span><span class="cx"> 97BC6A321505F081001B74AC /* DatabaseTracker.h in Headers */,
</span><span class="lines">@@ -24883,7 +24821,6 @@
</span><span class="cx"> E10B937C0B73C00A003ED890 /* JSCustomXPathNSResolver.h in Headers */,
</span><span class="cx"> 1AE82F900CAAFA9D002237AE /* JSDatabase.h in Headers */,
</span><span class="cx"> B59DD699119029E5007E9684 /* JSDatabaseCallback.h in Headers */,
</span><del>- B58CEB6911913607002A6790 /* JSDatabaseSync.h in Headers */,
</del><span class="cx"> BE61039E18A9D65A00DD50D7 /* JSDataCue.h in Headers */,
</span><span class="cx"> BCA83E500D7CE1E9003421A8 /* JSDataTransfer.h in Headers */,
</span><span class="cx"> 4162A4581011464700DFF3ED /* JSDedicatedWorkerGlobalScope.h in Headers */,
</span><span class="lines">@@ -25157,8 +25094,6 @@
</span><span class="cx"> BC82432A0D0CE8A200460C8F /* JSSQLTransaction.h in Headers */,
</span><span class="cx"> B59DD69D11902A42007E9684 /* JSSQLTransactionCallback.h in Headers */,
</span><span class="cx"> B59DD6A111902A52007E9684 /* JSSQLTransactionErrorCallback.h in Headers */,
</span><del>- B58CEB6D1191361C002A6790 /* JSSQLTransactionSync.h in Headers */,
- B55D5AA4119131FC00BCC315 /* JSSQLTransactionSyncCallback.h in Headers */,
</del><span class="cx"> 51E0BAEB0DA55D4A00A9E417 /* JSStorageEvent.h in Headers */,
</span><span class="cx"> 89F60CDA15809D760075E157 /* JSStorageInfo.h in Headers */,
</span><span class="cx"> 0FF5026A102BA9430066F39A /* JSStyleMedia.h in Headers */,
</span><span class="lines">@@ -26196,18 +26131,14 @@
</span><span class="cx"> FE8A674816CDD19E00930BF8 /* SQLStatementBackend.h in Headers */,
</span><span class="cx"> 97BC6A491505F081001B74AC /* SQLStatementCallback.h in Headers */,
</span><span class="cx"> 97BC6A4B1505F081001B74AC /* SQLStatementErrorCallback.h in Headers */,
</span><del>- 97BC6A4E1505F081001B74AC /* SQLStatementSync.h in Headers */,
</del><span class="cx"> 97BC6A501505F081001B74AC /* SQLTransaction.h in Headers */,
</span><span class="cx"> FEE1811416C319E800084849 /* SQLTransactionBackend.h in Headers */,
</span><del>- FEAD7D8816C339EE00D4670B /* SQLTransactionBackendSync.h in Headers */,
</del><span class="cx"> 97BC6A521505F081001B74AC /* SQLTransactionCallback.h in Headers */,
</span><span class="cx"> 97BC6A551505F081001B74AC /* SQLTransactionClient.h in Headers */,
</span><span class="cx"> 97BC6A571505F081001B74AC /* SQLTransactionCoordinator.h in Headers */,
</span><span class="cx"> 97BC6A581505F081001B74AC /* SQLTransactionErrorCallback.h in Headers */,
</span><span class="cx"> FE36FD1816C7826500F887C1 /* SQLTransactionState.h in Headers */,
</span><span class="cx"> FE36FD1716C7826500F887C1 /* SQLTransactionStateMachine.h in Headers */,
</span><del>- 97BC6A5B1505F081001B74AC /* SQLTransactionSync.h in Headers */,
- 97BC6A5D1505F081001B74AC /* SQLTransactionSyncCallback.h in Headers */,
</del><span class="cx"> 1A2E6E5A0CC55213004A2062 /* SQLValue.h in Headers */,
</span><span class="cx"> 93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */,
</span><span class="cx"> 26B999911803B3C900D01121 /* StackAllocator.h in Headers */,
</span><span class="lines">@@ -27581,13 +27512,11 @@
</span><span class="cx"> FE16CFD3169D1DED00D3A0C7 /* DatabaseBackend.cpp in Sources */,
</span><span class="cx"> 97BC69DA1505F076001B74AC /* DatabaseBackendBase.cpp in Sources */,
</span><span class="cx"> FE6F6AAF169E057500FC30A2 /* DatabaseBackendContext.cpp in Sources */,
</span><del>- FE16CFD5169D1DED00D3A0C7 /* DatabaseBackendSync.cpp in Sources */,
</del><span class="cx"> FEBC5F3116BD0CC300659BD3 /* DatabaseBase.cpp in Sources */,
</span><span class="cx"> 97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */,
</span><span class="cx"> FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */,
</span><span class="cx"> FEB26D28167A8F2A00FDD26B /* DatabaseServer.cpp in Sources */,
</span><span class="cx"> FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */,
</span><del>- 97BC6A2A1505F081001B74AC /* DatabaseSync.cpp in Sources */,
</del><span class="cx"> 97BC6A2D1505F081001B74AC /* DatabaseTask.cpp in Sources */,
</span><span class="cx"> 97BC6A2F1505F081001B74AC /* DatabaseThread.cpp in Sources */,
</span><span class="cx"> 97BC6A311505F081001B74AC /* DatabaseTracker.cpp in Sources */,
</span><span class="lines">@@ -28374,7 +28303,6 @@
</span><span class="cx"> E10B93C30B73C291003ED890 /* JSCustomXPathNSResolver.cpp in Sources */,
</span><span class="cx"> 1AE82F8F0CAAFA9D002237AE /* JSDatabase.cpp in Sources */,
</span><span class="cx"> B59DD69A119029E5007E9684 /* JSDatabaseCallback.cpp in Sources */,
</span><del>- B58CEB6A11913607002A6790 /* JSDatabaseSync.cpp in Sources */,
</del><span class="cx"> BE61039D18A9D65200DD50D7 /* JSDataCue.cpp in Sources */,
</span><span class="cx"> 07FBDE2C18FED178001A7CFF /* JSDataCueCustom.cpp in Sources */,
</span><span class="cx"> BCA83E4F0D7CE1E9003421A8 /* JSDataTransfer.cpp in Sources */,
</span><span class="lines">@@ -28725,9 +28653,6 @@
</span><span class="cx"> B59DD69E11902A42007E9684 /* JSSQLTransactionCallback.cpp in Sources */,
</span><span class="cx"> 1AD2316E0CD269E700C1F194 /* JSSQLTransactionCustom.cpp in Sources */,
</span><span class="cx"> B59DD6A211902A52007E9684 /* JSSQLTransactionErrorCallback.cpp in Sources */,
</span><del>- B58CEB6E1191361C002A6790 /* JSSQLTransactionSync.cpp in Sources */,
- B55D5AA5119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp in Sources */,
- B55D5AA91191325000BCC315 /* JSSQLTransactionSyncCustom.cpp in Sources */,
</del><span class="cx"> 51E3F9D60DA05E1D00250911 /* JSStorage.cpp in Sources */,
</span><span class="cx"> 51D0C5160DAA90B7003B3831 /* JSStorageCustom.cpp in Sources */,
</span><span class="cx"> 51E0BAEA0DA55D4A00A9E417 /* JSStorageEvent.cpp in Sources */,
</span><span class="lines">@@ -29639,15 +29564,12 @@
</span><span class="cx"> 97BC6A441505F081001B74AC /* SQLResultSetRowList.cpp in Sources */,
</span><span class="cx"> 97BC6A471505F081001B74AC /* SQLStatement.cpp in Sources */,
</span><span class="cx"> FE8A674716CDD19E00930BF8 /* SQLStatementBackend.cpp in Sources */,
</span><del>- 97BC6A4D1505F081001B74AC /* SQLStatementSync.cpp in Sources */,
</del><span class="cx"> 97BC6A4F1505F081001B74AC /* SQLTransaction.cpp in Sources */,
</span><span class="cx"> 2D4F96F51A1ECC240098BF88 /* TextIndicator.cpp in Sources */,
</span><span class="cx"> FEE1811316C319E800084849 /* SQLTransactionBackend.cpp in Sources */,
</span><del>- FEAD7D8716C339EE00D4670B /* SQLTransactionBackendSync.cpp in Sources */,
</del><span class="cx"> 97BC6A541505F081001B74AC /* SQLTransactionClient.cpp in Sources */,
</span><span class="cx"> 97BC6A561505F081001B74AC /* SQLTransactionCoordinator.cpp in Sources */,
</span><span class="cx"> FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */,
</span><del>- 97BC6A5A1505F081001B74AC /* SQLTransactionSync.cpp in Sources */,
</del><span class="cx"> 1A2E6E590CC55213004A2062 /* SQLValue.cpp in Sources */,
</span><span class="cx"> 4476531B133170990006B789 /* SSLKeyGeneratorIOS.cpp in Sources */,
</span><span class="cx"> 93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSQLTransactionSyncCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp (178208 => 178209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp 2015-01-09 22:39:33 UTC (rev 178208)
+++ trunk/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp 2015-01-09 23:15:35 UTC (rev 178209)
</span><span class="lines">@@ -1,99 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google 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"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "JSSQLTransactionSync.h"
-
-#include "ExceptionCode.h"
-#include "JSDOMBinding.h"
-#include "JSSQLResultSet.h"
-#include "SQLResultSet.h"
-#include "SQLValue.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue JSSQLTransactionSync::executeSql(ExecState* exec)
-{
- if (!exec->argumentCount()) {
- setDOMException(exec, SYNTAX_ERR);
- return jsUndefined();
- }
-
- String sqlStatement = exec->uncheckedArgument(0).toString(exec)->value(exec);
- if (exec->hadException())
- return jsUndefined();
-
- // Now assemble the list of SQL arguments
- Vector<SQLValue> sqlValues;
- if (!exec->argument(1).isUndefinedOrNull()) {
- JSObject* object = exec->argument(1).getObject();
- if (!object) {
- setDOMException(exec, TYPE_MISMATCH_ERR);
- return jsUndefined();
- }
-
- JSValue lengthValue = object->get(exec, exec->propertyNames().length);
- if (exec->hadException())
- return jsUndefined();
- unsigned length = lengthValue.toUInt32(exec);
- if (exec->hadException())
- return jsUndefined();
-
- for (unsigned i = 0 ; i < length; ++i) {
- JSValue value = object->get(exec, i);
- if (exec->hadException())
- return jsUndefined();
-
- if (value.isUndefinedOrNull())
- sqlValues.append(SQLValue());
- else if (value.isNumber())
- sqlValues.append(value.asNumber());
- else {
- // Convert the argument to a string and append it
- sqlValues.append(value.toString(exec)->value(exec));
- if (exec->hadException())
- return jsUndefined();
- }
- }
- }
-
- ExceptionCode ec = 0;
- JSValue result = toJS(exec, globalObject(), WTF::getPtr(m_impl->executeSQL(sqlStatement, sqlValues, ec)));
- setDOMException(exec, ec);
-
- return result;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre>
</div>
</div>
</body>
</html>