<!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>[178376] 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/178376">178376</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 14:23:41 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove pure virtual functions from DatabaseBackendBase
https://bugs.webkit.org/show_bug.cgi?id=140402
Reviewed by Sam Weinig.
Also change DatabaseBackendBase to Database in a couple of places.
* Modules/webdatabase/DatabaseBackendBase.cpp:
(WebCore::DatabaseBackendBase::closeDatabase):
(WebCore::DoneCreatingDatabaseOnExitCaller::~DoneCreatingDatabaseOnExitCaller):
(WebCore::DatabaseBackendBase::performOpenAndVerify):
(WebCore::DatabaseBackendBase::maximumSize):
* Modules/webdatabase/DatabaseBackendBase.h:
* Modules/webdatabase/DatabaseServer.cpp:
(WebCore::DatabaseServer::createDatabase):
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::getMaxSizeForDatabase):
(WebCore::DatabaseTracker::doneCreatingDatabase):
(WebCore::DatabaseTracker::addOpenDatabase):
(WebCore::DatabaseTracker::removeOpenDatabase):
(WebCore::DatabaseTracker::getOpenDatabases):
(WebCore::DatabaseTracker::deleteDatabaseFile):
* Modules/webdatabase/DatabaseTracker.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178375 => 178376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-13 22:22:27 UTC (rev 178375)
+++ trunk/Source/WebCore/ChangeLog 2015-01-13 22:23:41 UTC (rev 178376)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-01-13 Anders Carlsson <andersca@apple.com>
+
+ Remove pure virtual functions from DatabaseBackendBase
+ https://bugs.webkit.org/show_bug.cgi?id=140402
+
+ Reviewed by Sam Weinig.
+
+ Also change DatabaseBackendBase to Database in a couple of places.
+
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ (WebCore::DatabaseBackendBase::closeDatabase):
+ (WebCore::DoneCreatingDatabaseOnExitCaller::~DoneCreatingDatabaseOnExitCaller):
+ (WebCore::DatabaseBackendBase::performOpenAndVerify):
+ (WebCore::DatabaseBackendBase::maximumSize):
+ * Modules/webdatabase/DatabaseBackendBase.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ (WebCore::DatabaseServer::createDatabase):
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::getMaxSizeForDatabase):
+ (WebCore::DatabaseTracker::doneCreatingDatabase):
+ (WebCore::DatabaseTracker::addOpenDatabase):
+ (WebCore::DatabaseTracker::removeOpenDatabase):
+ (WebCore::DatabaseTracker::getOpenDatabases):
+ (WebCore::DatabaseTracker::deleteDatabaseFile):
+ * Modules/webdatabase/DatabaseTracker.h:
+
</ins><span class="cx"> 2015-01-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused ResizeImage and DecodeImageData timeline events
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (178375 => 178376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-01-13 22:22:27 UTC (rev 178375)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-01-13 22:23:41 UTC (rev 178376)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> m_sqliteDatabase.close();
</span><span class="cx"> m_opened = false;
</span><span class="cx"> // See comment at the top this file regarding calling removeOpenDatabase().
</span><del>- DatabaseTracker::tracker().removeOpenDatabase(this);
</del><ins>+ DatabaseTracker::tracker().removeOpenDatabase(static_cast<Database*>(this));
</ins><span class="cx"> {
</span><span class="cx"> std::lock_guard<std::mutex> locker(guidMutex());
</span><span class="cx">
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> }
</span><span class="cx"> ~DoneCreatingDatabaseOnExitCaller()
</span><span class="cx"> {
</span><del>- DatabaseTracker::tracker().doneCreatingDatabase(m_database);
</del><ins>+ DatabaseTracker::tracker().doneCreatingDatabase(static_cast<Database*>(m_database));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setOpenSucceeded() { m_openSucceeded = true; }
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> m_sqliteDatabase.setAuthorizer(m_databaseAuthorizer);
</span><span class="cx">
</span><span class="cx"> // See comment at the top this file regarding calling addOpenDatabase().
</span><del>- DatabaseTracker::tracker().addOpenDatabase(this);
</del><ins>+ DatabaseTracker::tracker().addOpenDatabase(static_cast<Database*>(this));
</ins><span class="cx"> m_opened = true;
</span><span class="cx">
</span><span class="cx"> // Declare success:
</span><span class="lines">@@ -559,7 +559,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned long long DatabaseBackendBase::maximumSize() const
</span><span class="cx"> {
</span><del>- return DatabaseTracker::tracker().getMaxSizeForDatabase(this);
</del><ins>+ return DatabaseTracker::tracker().getMaxSizeForDatabase(static_cast<const Database*>(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseBackendBase::incrementalVacuumIfNeeded()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseBackendBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (178375 => 178376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-01-13 22:22:27 UTC (rev 178375)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-01-13 22:23:41 UTC (rev 178376)
</span><span class="lines">@@ -79,9 +79,6 @@
</span><span class="cx"> bool hadDeletes();
</span><span class="cx"> void resetAuthorizer();
</span><span class="cx">
</span><del>- virtual void markAsDeletedAndClose() = 0;
- virtual void closeImmediately() = 0;
-
</del><span class="cx"> DatabaseContext* databaseContext() const { return m_databaseContext.get(); }
</span><span class="cx"> void setFrontend(Database* frontend) { m_frontend = frontend; }
</span><span class="cx">
</span><span class="lines">@@ -96,7 +93,6 @@
</span><span class="cx">
</span><span class="cx"> void closeDatabase();
</span><span class="cx">
</span><del>- virtual bool openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage) = 0;
</del><span class="cx"> virtual bool performOpenAndVerify(bool shouldSetVersionInNewDatabase, DatabaseError&, String& errorMessage);
</span><span class="cx">
</span><span class="cx"> bool getVersionFromDatabase(String& version, bool shouldCacheVersion = true);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (178375 => 178376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-01-13 22:22:27 UTC (rev 178375)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-01-13 22:23:41 UTC (rev 178376)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DatabaseBackendBase> DatabaseServer::createDatabase(RefPtr<DatabaseContext>& backendContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<DatabaseBackendBase> database = adoptRef(new Database(backendContext, name, expectedVersion, displayName, estimatedSize));
</del><ins>+ RefPtr<Database> database = adoptRef(new Database(backendContext, name, expectedVersion, displayName, estimatedSize));
</ins><span class="cx">
</span><span class="cx"> if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMessage))
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (178375 => 178376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-01-13 22:22:27 UTC (rev 178375)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-01-13 22:23:41 UTC (rev 178376)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> return statement.step() == SQLResultRow;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned long long DatabaseTracker::getMaxSizeForDatabase(const DatabaseBackendBase* database)
</del><ins>+unsigned long long DatabaseTracker::getMaxSizeForDatabase(const Database* database)
</ins><span class="cx"> {
</span><span class="cx"> // The maximum size for a database is the full quota for its origin, minus the current usage within the origin,
</span><span class="cx"> // plus the current usage of the given database
</span><span class="lines">@@ -543,13 +543,13 @@
</span><span class="cx"> m_client->dispatchDidModifyDatabase(origin, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseTracker::doneCreatingDatabase(DatabaseBackendBase* database)
</del><ins>+void DatabaseTracker::doneCreatingDatabase(Database* database)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker lockDatabase(m_databaseGuard);
</span><span class="cx"> doneCreatingDatabase(database->securityOrigin(), database->stringIdentifier());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseTracker::addOpenDatabase(DatabaseBackendBase* database)
</del><ins>+void DatabaseTracker::addOpenDatabase(Database* database)
</ins><span class="cx"> {
</span><span class="cx"> if (!database)
</span><span class="cx"> return;
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseTracker::removeOpenDatabase(DatabaseBackendBase* database)
</del><ins>+void DatabaseTracker::removeOpenDatabase(Database* database)
</ins><span class="cx"> {
</span><span class="cx"> if (!database)
</span><span class="cx"> return;
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<DatabaseBackendBase>>* databases)
</del><ins>+void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<Database>>* databases)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
</span><span class="cx"> if (!m_openDatabaseMap)
</span><span class="lines">@@ -1105,7 +1105,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Vector<RefPtr<DatabaseBackendBase>> deletedDatabases;
</del><ins>+ Vector<RefPtr<Database>> deletedDatabases;
</ins><span class="cx">
</span><span class="cx"> // Make sure not to hold the any locks when calling
</span><span class="cx"> // Database::markAsDeletedAndClose(), since that can cause a deadlock
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h (178375 => 178376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-01-13 22:22:27 UTC (rev 178375)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h 2015-01-13 22:23:41 UTC (rev 178376)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DatabaseBackendBase;
</del><ins>+class Database;
</ins><span class="cx"> class DatabaseContext;
</span><span class="cx"> class DatabaseManagerClient;
</span><span class="cx"> class OriginLock;
</span><span class="lines">@@ -67,11 +67,11 @@
</span><span class="cx"> void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize);
</span><span class="cx"> String fullPathForDatabase(SecurityOrigin*, const String& name, bool createIfDoesNotExist = true);
</span><span class="cx">
</span><del>- void addOpenDatabase(DatabaseBackendBase*);
- void removeOpenDatabase(DatabaseBackendBase*);
- void getOpenDatabases(SecurityOrigin*, const String& name, HashSet<RefPtr<DatabaseBackendBase>>* databases);
</del><ins>+ void addOpenDatabase(Database*);
+ void removeOpenDatabase(Database*);
+ void getOpenDatabases(SecurityOrigin*, const String& name, HashSet<RefPtr<Database>>* databases);
</ins><span class="cx">
</span><del>- unsigned long long getMaxSizeForDatabase(const DatabaseBackendBase*);
</del><ins>+ unsigned long long getMaxSizeForDatabase(const Database*);
</ins><span class="cx">
</span><span class="cx"> void interruptAllDatabasesForContext(const DatabaseContext*);
</span><span class="cx">
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasEntryForOrigin(SecurityOrigin*);
</span><span class="cx">
</span><del>- void doneCreatingDatabase(DatabaseBackendBase*);
</del><ins>+ void doneCreatingDatabase(Database*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool hasEntryForOriginNoLock(SecurityOrigin* origin);
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> void deleteOriginLockFor(SecurityOrigin*);
</span><span class="cx">
</span><del>- typedef HashSet<DatabaseBackendBase*> DatabaseSet;
</del><ins>+ typedef HashSet<Database*> DatabaseSet;
</ins><span class="cx"> typedef HashMap<String, DatabaseSet*> DatabaseNameMap;
</span><span class="cx"> typedef HashMap<RefPtr<SecurityOrigin>, DatabaseNameMap*> DatabaseOriginMap;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>