<!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>[178279] 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/178279">178279</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-12 10:09:10 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge DatabaseBase into Database
https://bugs.webkit.org/show_bug.cgi?id=140345
Reviewed by Antti Koivisto.
* CMakeLists.txt:
* Modules/webdatabase/Database.cpp:
(WebCore::Database::Database):
(WebCore::Database::runTransaction):
(WebCore::Database::logErrorMessage):
* Modules/webdatabase/Database.h:
(WebCore::Database::scriptExecutionContext):
* Modules/webdatabase/DatabaseBackendBase.cpp:
* Modules/webdatabase/DatabaseBackendBase.h:
(WebCore::DatabaseBackendBase::setFrontend):
* Modules/webdatabase/DatabaseBase.cpp: Removed.
* Modules/webdatabase/DatabaseBase.h: Removed.
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:</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="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseh">trunk/Source/WebCore/Modules/webdatabase/Database.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h</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="#trunkSourceWebCoreModuleswebdatabaseDatabaseBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBaseh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -951,7 +951,6 @@
</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/DatabaseBase.cpp
</del><span class="cx"> Modules/webdatabase/DatabaseContext.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseManager.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseServer.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/ChangeLog 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-01-11 Anders Carlsson <andersca@apple.com>
+
+ Merge DatabaseBase into Database
+ https://bugs.webkit.org/show_bug.cgi?id=140345
+
+ Reviewed by Antti Koivisto.
+
+ * CMakeLists.txt:
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::Database):
+ (WebCore::Database::runTransaction):
+ (WebCore::Database::logErrorMessage):
+ * Modules/webdatabase/Database.h:
+ (WebCore::Database::scriptExecutionContext):
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ * Modules/webdatabase/DatabaseBackendBase.h:
+ (WebCore::DatabaseBackendBase::setFrontend):
+ * Modules/webdatabase/DatabaseBase.cpp: Removed.
+ * Modules/webdatabase/DatabaseBase.h: Removed.
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-01-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Modernize and streamline HTMLTokenizer
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -71,10 +71,9 @@
</span><span class="cx"> return static_cast<Database*>(backend.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Database::Database(PassRefPtr<DatabaseBackendContext> databaseContext,
- const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBase(databaseContext->scriptExecutionContext())
- , DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize)
</del><ins>+Database::Database(PassRefPtr<DatabaseBackendContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
+ : DatabaseBackend(databaseContext.get(), name, expectedVersion, displayName, estimatedSize)
+ , m_scriptExecutionContext(databaseContext->scriptExecutionContext())
</ins><span class="cx"> , m_databaseContext(DatabaseBackend::databaseContext()->frontend())
</span><span class="cx"> , m_deleted(false)
</span><span class="cx"> {
</span><span class="lines">@@ -169,7 +168,7 @@
</span><span class="cx"> RefPtr<SQLTransactionBackend> transactionBackend = backend()->runTransaction(transaction.release(), readOnly, changeVersionData);
</span><span class="cx"> if (!transactionBackend && errorCallback) {
</span><span class="cx"> WTF::RefPtr<SQLTransactionErrorCallback> errorCallbackProtector = WTF::move(errorCallback);
</span><del>- scriptExecutionContext()->postTask([errorCallbackProtector](ScriptExecutionContext&) {
</del><ins>+ m_scriptExecutionContext->postTask([errorCallbackProtector](ScriptExecutionContext&) {
</ins><span class="cx"> errorCallbackProtector->handleEvent(SQLError::create(SQLError::UNKNOWN_ERR, "database has been closed").get());
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -212,6 +211,11 @@
</span><span class="cx"> return tableNames;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Database::logErrorMessage(const String& message)
+{
+ m_scriptExecutionContext->addConsoleMessage(MessageSource::Storage, MessageLevel::Error, message);
+}
+
</ins><span class="cx"> Vector<String> Database::tableNames()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Not using isolatedCopy on these strings looks ok since threads take strict turns
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "DatabaseBackend.h"
</span><del>-#include "DatabaseBase.h"
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -42,6 +41,7 @@
</span><span class="cx"> class ChangeVersionData;
</span><span class="cx"> class DatabaseCallback;
</span><span class="cx"> class DatabaseContext;
</span><ins>+class ScriptExecutionContext;
</ins><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class SQLTransaction;
</span><span class="cx"> class SQLTransactionBackend;
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> class SQLTransactionErrorCallback;
</span><span class="cx"> class VoidCallback;
</span><span class="cx">
</span><del>-class Database : public DatabaseBase, public DatabaseBackend {
</del><ins>+class Database : public DatabaseBackend {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~Database();
</span><span class="cx">
</span><span class="lines">@@ -64,6 +64,9 @@
</span><span class="cx"> static Database* from(DatabaseBackend*);
</span><span class="cx"> DatabaseContext* databaseContext() const { return m_databaseContext.get(); }
</span><span class="cx">
</span><ins>+ ScriptExecutionContext* scriptExecutionContext() { return m_scriptExecutionContext.get(); }
+ void logErrorMessage(const String& message);
+
</ins><span class="cx"> Vector<String> tableNames();
</span><span class="cx">
</span><span class="cx"> virtual SecurityOrigin* securityOrigin() const;
</span><span class="lines">@@ -85,6 +88,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> performGetTableNames();
</span><span class="cx">
</span><ins>+ RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
</ins><span class="cx"> RefPtr<SecurityOrigin> m_databaseThreadSecurityOrigin;
</span><span class="cx"> RefPtr<DatabaseContext> m_databaseContext;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><ins>+#include "Database.h"
</ins><span class="cx"> #include "DatabaseAuthorizer.h"
</span><span class="cx"> #include "DatabaseBackendContext.h"
</span><del>-#include "DatabaseBase.h"
</del><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseManager.h"
</span><span class="cx"> #include "DatabaseTracker.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Database;
</ins><span class="cx"> class DatabaseAuthorizer;
</span><span class="cx"> class DatabaseBackendContext;
</span><del>-class DatabaseBase;
</del><span class="cx"> class SecurityOrigin;
</span><span class="cx">
</span><span class="cx"> class DatabaseBackendBase : public ThreadSafeRefCounted<DatabaseBackendBase> {
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> virtual void closeImmediately() = 0;
</span><span class="cx">
</span><span class="cx"> DatabaseBackendContext* databaseContext() const { return m_databaseContext.get(); }
</span><del>- void setFrontend(DatabaseBase* frontend) { m_frontend = frontend; }
</del><ins>+ void setFrontend(Database* frontend) { m_frontend = frontend; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> friend class ChangeVersionWrapper;
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> unsigned long m_estimatedSize;
</span><span class="cx"> String m_filename;
</span><span class="cx">
</span><del>- DatabaseBase* m_frontend;
</del><ins>+ Database* m_frontend;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DatabaseGuid m_guid;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBasecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.cpp 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -1,54 +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 "DatabaseBase.h"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "ScriptExecutionContext.h"
-#include <wtf/Assertions.h>
-
-namespace WebCore {
-
-DatabaseBase::DatabaseBase(ScriptExecutionContext* scriptExecutionContext)
- : m_scriptExecutionContext(scriptExecutionContext)
-{
- ASSERT(m_scriptExecutionContext->isContextThread());
-}
-
-ScriptExecutionContext* DatabaseBase::scriptExecutionContext() const
-{
- return m_scriptExecutionContext.get();
-}
-
-void DatabaseBase::logErrorMessage(const String& message)
-{
- m_scriptExecutionContext->addConsoleMessage(MessageSource::Storage, MessageLevel::Error, message);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBaseh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.h (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.h 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBase.h 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -1,52 +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 DatabaseBase_h
-#define DatabaseBase_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class ScriptExecutionContext;
-
-class DatabaseBase {
-public:
- ScriptExecutionContext* scriptExecutionContext() const;
- void logErrorMessage(const String& message);
-
-protected:
- DatabaseBase(ScriptExecutionContext*);
-
- RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif // DatabaseBase_h
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -6772,7 +6772,6 @@
</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\DatabaseBase.cpp" />
</del><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><span class="lines">@@ -19022,7 +19021,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBackendContext.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBackendSync.h" />
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseBase.h" />
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBasicTypes.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseCallback.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseContext.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -474,9 +474,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\DatabaseBase.cpp">
- <Filter>Modules\webdatabase</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseContext.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7359,9 +7356,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\DatabaseBase.h">
- <Filter>Modules\webdatabase</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseBasicTypes.h">
</span><span class="cx"> <Filter>Modules\webdatabase</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 (178278 => 178279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-12 18:06:03 UTC (rev 178278)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-12 18:09:10 UTC (rev 178279)
</span><span class="lines">@@ -6685,8 +6685,6 @@
</span><span class="cx"> FE9E89FC16E2DC0500A908F8 /* OriginLock.h in Headers */ = {isa = PBXBuildFile; fileRef = FE9E89FA16E2DC0400A908F8 /* OriginLock.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><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><del>- FEBC5F3116BD0CC300659BD3 /* DatabaseBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */; };
- FEBC5F3216BD0CC300659BD3 /* DatabaseBase.h in Headers */ = {isa = PBXBuildFile; fileRef = FEBC5F3016BD0CC300659BD3 /* DatabaseBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> FED13D2A0CEA91DF00D89466 /* DOMUIKitExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = FED13D260CEA91DF00D89466 /* DOMUIKitExtensions.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FED13D2B0CEA91DF00D89466 /* DOMUIKitExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D270CEA91DF00D89466 /* DOMUIKitExtensions.mm */; };
</span><span class="cx"> FED13D3A0CEA934600D89466 /* EditorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D390CEA934600D89466 /* EditorIOS.mm */; };
</span><span class="lines">@@ -14274,8 +14272,6 @@
</span><span class="cx"> FE9E89FA16E2DC0400A908F8 /* OriginLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OriginLock.h; sourceTree = "<group>"; };
</span><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><del>- FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBase.cpp; sourceTree = "<group>"; };
- FEBC5F3016BD0CC300659BD3 /* DatabaseBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBase.h; sourceTree = "<group>"; };
</del><span class="cx"> FED13D260CEA91DF00D89466 /* DOMUIKitExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMUIKitExtensions.h; sourceTree = "<group>"; };
</span><span class="cx"> FED13D270CEA91DF00D89466 /* DOMUIKitExtensions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMUIKitExtensions.mm; sourceTree = "<group>"; };
</span><span class="cx"> FED13D390CEA934600D89466 /* EditorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EditorIOS.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -18314,8 +18310,6 @@
</span><span class="cx"> 97BC69D71505F076001B74AC /* DatabaseBackendBase.h */,
</span><span class="cx"> FE6F6AAD169E057500FC30A2 /* DatabaseBackendContext.cpp */,
</span><span class="cx"> FE6F6AAE169E057500FC30A2 /* DatabaseBackendContext.h */,
</span><del>- FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */,
- FEBC5F3016BD0CC300659BD3 /* DatabaseBase.h */,
</del><span class="cx"> FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */,
</span><span class="cx"> 97BC69E31505F081001B74AC /* DatabaseCallback.h */,
</span><span class="cx"> 97BC69E41505F081001B74AC /* DatabaseCallback.idl */,
</span><span class="lines">@@ -23798,7 +23792,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>- FEBC5F3216BD0CC300659BD3 /* DatabaseBase.h in Headers */,
</del><span class="cx"> FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */,
</span><span class="cx"> 97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */,
</span><span class="cx"> 97BC6A281505F081001B74AC /* DatabaseContext.h in Headers */,
</span><span class="lines">@@ -27502,7 +27495,6 @@
</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>- FEBC5F3116BD0CC300659BD3 /* DatabaseBase.cpp in Sources */,
</del><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></pre>
</div>
</div>
</body>
</html>