<!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>[188061] 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/188061">188061</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-06 14:23:55 -0700 (Thu, 06 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of DatabaseBackendBase
https://bugs.webkit.org/show_bug.cgi?id=147733
Reviewed by Geoffrey Garen.
* CMakeLists.txt:
* Modules/webdatabase/Database.cpp:
(WebCore::Database::Database):
(WebCore::DoneCreatingDatabaseOnExitCaller::DoneCreatingDatabaseOnExitCaller):
(WebCore::DoneCreatingDatabaseOnExitCaller::~DoneCreatingDatabaseOnExitCaller):
* Modules/webdatabase/Database.h:
* Modules/webdatabase/DatabaseBackendBase.cpp: Removed.
(WebCore::DatabaseBackendBase::DatabaseBackendBase): Deleted.
(WebCore::DatabaseBackendBase::~DatabaseBackendBase): Deleted.
* Modules/webdatabase/DatabaseBackendBase.h: Removed.
* Modules/webdatabase/DatabaseManager.cpp:
* Modules/webdatabase/DatabaseManager.h:
* Modules/webdatabase/DatabaseTracker.cpp:
* 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="#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="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.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="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh">trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.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 (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -1003,7 +1003,6 @@
</span><span class="cx"> Modules/webdatabase/DOMWindowWebDatabase.cpp
</span><span class="cx"> Modules/webdatabase/Database.cpp
</span><span class="cx"> Modules/webdatabase/DatabaseAuthorizer.cpp
</span><del>- Modules/webdatabase/DatabaseBackendBase.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 (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/ChangeLog 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-08-06 Anders Carlsson <andersca@apple.com>
+
+ Get rid of DatabaseBackendBase
+ https://bugs.webkit.org/show_bug.cgi?id=147733
+
+ Reviewed by Geoffrey Garen.
+
+ * CMakeLists.txt:
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::Database):
+ (WebCore::DoneCreatingDatabaseOnExitCaller::DoneCreatingDatabaseOnExitCaller):
+ (WebCore::DoneCreatingDatabaseOnExitCaller::~DoneCreatingDatabaseOnExitCaller):
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/DatabaseBackendBase.cpp: Removed.
+ (WebCore::DatabaseBackendBase::DatabaseBackendBase): Deleted.
+ (WebCore::DatabaseBackendBase::~DatabaseBackendBase): Deleted.
+ * Modules/webdatabase/DatabaseBackendBase.h: Removed.
+ * Modules/webdatabase/DatabaseManager.cpp:
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-08-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Add comment to CSSParserString
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> guidToVersionMap().set(guid, newVersion.isEmpty() ? String() : newVersion.isolatedCopy());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-typedef HashMap<DatabaseGuid, std::unique_ptr<HashSet<DatabaseBackendBase*>>> GuidDatabaseMap;
</del><ins>+typedef HashMap<DatabaseGuid, std::unique_ptr<HashSet<Database*>>> GuidDatabaseMap;
</ins><span class="cx">
</span><span class="cx"> static GuidDatabaseMap& guidToDatabaseMap()
</span><span class="cx"> {
</span><span class="lines">@@ -236,9 +236,9 @@
</span><span class="cx"> std::lock_guard<std::mutex> locker(guidMutex());
</span><span class="cx">
</span><span class="cx"> m_guid = guidForOriginAndName(securityOrigin()->toString(), name);
</span><del>- std::unique_ptr<HashSet<DatabaseBackendBase*>>& hashSet = guidToDatabaseMap().add(m_guid, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<HashSet<Database*>>& hashSet = guidToDatabaseMap().add(m_guid, nullptr).iterator->value;
</ins><span class="cx"> if (!hashSet)
</span><del>- hashSet = std::make_unique<HashSet<DatabaseBackendBase*>>();
</del><ins>+ hashSet = std::make_unique<HashSet<Database*>>();
</ins><span class="cx"> hashSet->add(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -324,20 +324,20 @@
</span><span class="cx">
</span><span class="cx"> class DoneCreatingDatabaseOnExitCaller {
</span><span class="cx"> public:
</span><del>- DoneCreatingDatabaseOnExitCaller(DatabaseBackendBase* database)
</del><ins>+ DoneCreatingDatabaseOnExitCaller(Database* database)
</ins><span class="cx"> : m_database(database)
</span><span class="cx"> , m_openSucceeded(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> ~DoneCreatingDatabaseOnExitCaller()
</span><span class="cx"> {
</span><del>- DatabaseTracker::tracker().doneCreatingDatabase(static_cast<Database*>(m_database));
</del><ins>+ DatabaseTracker::tracker().doneCreatingDatabase(m_database);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setOpenSucceeded() { m_openSucceeded = true; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- DatabaseBackendBase* m_database;
</del><ins>+ Database* m_database;
</ins><span class="cx"> bool m_openSucceeded;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #ifndef Database_h
</span><span class="cx"> #define Database_h
</span><span class="cx">
</span><del>-#include "DatabaseBackendBase.h"
</del><span class="cx"> #include "DatabaseBasicTypes.h"
</span><span class="cx"> #include "DatabaseError.h"
</span><ins>+#include "SQLiteDatabase.h"
</ins><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> class ChangeVersionData;
</span><span class="cx"> class DatabaseCallback;
</span><ins>+class DatabaseDetails;
</ins><span class="cx"> class DatabaseContext;
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="cx"> class SecurityOrigin;
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> class SQLTransactionErrorCallback;
</span><span class="cx"> class VoidCallback;
</span><span class="cx">
</span><del>-class Database final : public DatabaseBackendBase {
</del><ins>+class Database final : public ThreadSafeRefCounted<Database> {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~Database();
</span><span class="cx">
</span><span class="lines">@@ -166,7 +167,6 @@
</span><span class="cx"> bool m_isTransactionQueueEnabled;
</span><span class="cx">
</span><span class="cx"> friend class ChangeVersionWrapper;
</span><del>- friend class DatabaseBackendBase;
</del><span class="cx"> friend class DatabaseManager;
</span><span class="cx"> friend class DatabaseServer; // FIXME: remove this when the backend has been split out.
</span><span class="cx"> friend class SQLStatement;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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:
- *
- * 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 "DatabaseBackendBase.h"
-
-#include "Database.h"
-#include "DatabaseAuthorizer.h"
-#include "DatabaseContext.h"
-#include "DatabaseManager.h"
-#include "DatabaseTracker.h"
-#include "ExceptionCode.h"
-#include "Logging.h"
-#include "SQLiteDatabaseTracker.h"
-#include "SQLiteStatement.h"
-#include "SecurityOrigin.h"
-#include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
-#include <wtf/NeverDestroyed.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/StdLibExtras.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/StringHash.h>
-
-namespace WebCore {
-
-DatabaseBackendBase::DatabaseBackendBase()
-{
-}
-
-DatabaseBackendBase::~DatabaseBackendBase()
-{
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DatabaseBackendBase_h
-#define DatabaseBackendBase_h
-
-#include "DatabaseBasicTypes.h"
-#include "DatabaseDetails.h"
-#include "DatabaseError.h"
-#include "SQLiteDatabase.h"
-#include <wtf/Forward.h>
-#include <wtf/RefPtr.h>
-#include <wtf/ThreadSafeRefCounted.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class Database;
-class DatabaseAuthorizer;
-class DatabaseContext;
-class SecurityOrigin;
-
-class DatabaseBackendBase : public ThreadSafeRefCounted<DatabaseBackendBase> {
-public:
- virtual ~DatabaseBackendBase();
-
-
-protected:
- friend class ChangeVersionWrapper;
- friend class SQLStatementBackend;
- friend class SQLStatementSync;
- friend class SQLTransactionBackend;
- friend class SQLTransactionBackendSync;
-
- DatabaseBackendBase();
-
- friend class DatabaseServer;
-};
-
-} // namespace WebCore
-
-#endif // DatabaseBackendBase_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AbstractDatabaseServer.h"
</span><span class="cx"> #include "Database.h"
</span><del>-#include "DatabaseBackendBase.h"
</del><span class="cx"> #include "DatabaseCallback.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseServer.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx">
</span><span class="cx"> class AbstractDatabaseServer;
</span><span class="cx"> class Database;
</span><del>-class DatabaseBackendBase;
</del><span class="cx"> class DatabaseCallback;
</span><span class="cx"> class DatabaseContext;
</span><span class="cx"> class DatabaseManagerClient;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "Database.h"
</span><del>-#include "DatabaseBackendBase.h"
</del><span class="cx"> #include "DatabaseContext.h"
</span><span class="cx"> #include "DatabaseManager.h"
</span><span class="cx"> #include "DatabaseManagerClient.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -6808,7 +6808,6 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\Database.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp" />
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.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">@@ -20547,7 +20546,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\ChangeVersionWrapper.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\Database.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h" />
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.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 (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -483,9 +483,6 @@
</span><span class="cx"> <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\Modules\webdatabase\DatabaseBackendBase.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">@@ -7445,9 +7442,6 @@
</span><span class="cx"> <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h">
</span><span class="cx"> <Filter>Modules\webdatabase</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\Modules\webdatabase\DatabaseBackendBase.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 (188060 => 188061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-06 21:23:10 UTC (rev 188060)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-06 21:23:55 UTC (rev 188061)
</span><span class="lines">@@ -3702,8 +3702,6 @@
</span><span class="cx"> 97B38E27151C4271004622E9 /* DOMWindowNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 97B38E24151C4264004622E9 /* DOMWindowNotifications.h */; };
</span><span class="cx"> 97B38E28151C4273004622E9 /* DOMWindowNotifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97B38E23151C4264004622E9 /* DOMWindowNotifications.cpp */; };
</span><span class="cx"> 97B8FFD116AE7F960038388D /* CharacterReferenceParserInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 97B8FFCF16AE7F920038388D /* CharacterReferenceParserInlines.h */; };
</span><del>- 97BC69DA1505F076001B74AC /* DatabaseBackendBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D61505F076001B74AC /* DatabaseBackendBase.cpp */; };
- 97BC69DB1505F076001B74AC /* DatabaseBackendBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D71505F076001B74AC /* DatabaseBackendBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 97BC69DC1505F076001B74AC /* ChangeVersionWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */; };
</span><span class="cx"> 97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */; };
</span><span class="cx"> 97BC6A201505F081001B74AC /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69DE1505F081001B74AC /* Database.cpp */; };
</span><span class="lines">@@ -11038,8 +11036,6 @@
</span><span class="cx"> 97B38E24151C4264004622E9 /* DOMWindowNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowNotifications.h; sourceTree = "<group>"; };
</span><span class="cx"> 97B38E25151C4264004622E9 /* DOMWindowNotifications.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMWindowNotifications.idl; sourceTree = "<group>"; };
</span><span class="cx"> 97B8FFCF16AE7F920038388D /* CharacterReferenceParserInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterReferenceParserInlines.h; sourceTree = "<group>"; };
</span><del>- 97BC69D61505F076001B74AC /* DatabaseBackendBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseBackendBase.cpp; sourceTree = "<group>"; };
- 97BC69D71505F076001B74AC /* DatabaseBackendBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseBackendBase.h; sourceTree = "<group>"; };
</del><span class="cx"> 97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChangeVersionWrapper.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeVersionWrapper.h; sourceTree = "<group>"; };
</span><span class="cx"> 97BC69DE1505F081001B74AC /* Database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Database.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -18779,8 +18775,6 @@
</span><span class="cx"> 97BC69E01505F081001B74AC /* Database.idl */,
</span><span class="cx"> 97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */,
</span><span class="cx"> 97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */,
</span><del>- 97BC69D61505F076001B74AC /* DatabaseBackendBase.cpp */,
- 97BC69D71505F076001B74AC /* DatabaseBackendBase.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">@@ -24360,7 +24354,6 @@
</span><span class="cx"> 26F756B01B3B65AC0005DD79 /* MutableRange.h in Headers */,
</span><span class="cx"> 97BC6A211505F081001B74AC /* Database.h in Headers */,
</span><span class="cx"> 97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */,
</span><del>- 97BC69DB1505F076001B74AC /* DatabaseBackendBase.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">@@ -28117,7 +28110,6 @@
</span><span class="cx"> 62CD32591157E57C0063B0A7 /* CustomEvent.cpp in Sources */,
</span><span class="cx"> 97BC6A201505F081001B74AC /* Database.cpp in Sources */,
</span><span class="cx"> 97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */,
</span><del>- 97BC69DA1505F076001B74AC /* DatabaseBackendBase.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"> 1ACB2B231A5733F400333392 /* DatabaseProvider.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>