<!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>[163884] branches/safari-537.75-branch/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/163884">163884</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 09:49:30 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/158058">r158058</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreModuleswebdatabaseDatabaseManagercpp">branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreModuleswebdatabaseDatabaseManagerh">branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (163883 => 163884)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-11 17:36:10 UTC (rev 163883)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-11 17:49:30 UTC (rev 163884)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-02-11 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r158058.
+
+ 2013-10-25 Mark Lam <mark.lam@apple.com>
+
+ DatabaseManager's ProposedDatabases need to be thread-safe.
+ https://bugs.webkit.org/show_bug.cgi?id=123313.
+
+ Reviewed by Geoffrey Garen.
+
+ No new tests.
+
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::DatabaseManager):
+ (WebCore::DatabaseManager::existingDatabaseContextFor):
+ (WebCore::DatabaseManager::registerDatabaseContext):
+ (WebCore::DatabaseManager::unregisterDatabaseContext):
+ (WebCore::DatabaseManager::didConstructDatabaseContext):
+ (WebCore::DatabaseManager::didDestructDatabaseContext):
+ (WebCore::DatabaseManager::openDatabaseBackend):
+ (WebCore::DatabaseManager::addProposedDatabase):
+ (WebCore::DatabaseManager::removeProposedDatabase):
+ (WebCore::DatabaseManager::fullPathForDatabase):
+ (WebCore::DatabaseManager::detailsForNameAndOrigin):
+ * Modules/webdatabase/DatabaseManager.h:
+
</ins><span class="cx"> 2014-02-10 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r162486
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (163883 => 163884)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-02-11 17:36:10 UTC (rev 163883)
+++ branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-02-11 17:49:30 UTC (rev 163884)
</span><span class="lines">@@ -49,6 +49,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+DatabaseManager::ProposedDatabase::ProposedDatabase(DatabaseManager& manager,
+ SecurityOrigin* origin, const String& name, const String& displayName, unsigned long estimatedSize)
+ : m_manager(manager)
+ , m_origin(origin->isolatedCopy())
+ , m_details(name.isolatedCopy(), displayName.isolatedCopy(), estimatedSize, 0)
+{
+ m_manager.addProposedDatabase(this);
+}
+
+DatabaseManager::ProposedDatabase::~ProposedDatabase()
+{
+ m_manager.removeProposedDatabase(this);
+}
+
</ins><span class="cx"> DatabaseManager& DatabaseManager::manager()
</span><span class="cx"> {
</span><span class="cx"> static DatabaseManager* dbManager = 0;
</span><span class="lines">@@ -128,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DatabaseContext> DatabaseManager::existingDatabaseContextFor(ScriptExecutionContext* context)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_contextMapLock);
</del><ins>+ MutexLocker locker(m_lock);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_databaseContextRegisteredCount >= 0);
</span><span class="cx"> ASSERT(m_databaseContextInstanceCount >= 0);
</span><span class="lines">@@ -159,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::registerDatabaseContext(DatabaseContext* databaseContext)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_contextMapLock);
</del><ins>+ MutexLocker locker(m_lock);
</ins><span class="cx"> ScriptExecutionContext* context = databaseContext->scriptExecutionContext();
</span><span class="cx"> m_contextMap.set(context, databaseContext);
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="lines">@@ -169,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::unregisterDatabaseContext(DatabaseContext* databaseContext)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_contextMapLock);
</del><ins>+ MutexLocker locker(m_lock);
</ins><span class="cx"> ScriptExecutionContext* context = databaseContext->scriptExecutionContext();
</span><span class="cx"> ASSERT(m_contextMap.get(context));
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="lines">@@ -181,13 +195,13 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void DatabaseManager::didConstructDatabaseContext()
</span><span class="cx"> {
</span><del>- MutexLocker lock(m_contextMapLock);
</del><ins>+ MutexLocker lock(m_lock);
</ins><span class="cx"> m_databaseContextInstanceCount++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::didDestructDatabaseContext()
</span><span class="cx"> {
</span><del>- MutexLocker lock(m_contextMapLock);
</del><ins>+ MutexLocker lock(m_lock);
</ins><span class="cx"> m_databaseContextInstanceCount--;
</span><span class="cx"> ASSERT(m_databaseContextRegisteredCount <= m_databaseContextInstanceCount);
</span><span class="cx"> }
</span><span class="lines">@@ -278,6 +292,18 @@
</span><span class="cx"> return backend.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseManager::addProposedDatabase(ProposedDatabase* proposedDb)
+{
+ MutexLocker locker(m_lock);
+ m_proposedDatabases.add(proposedDb);
+}
+
+void DatabaseManager::removeProposedDatabase(ProposedDatabase* proposedDb)
+{
+ MutexLocker locker(m_lock);
+ m_proposedDatabases.remove(proposedDb);
+}
+
</ins><span class="cx"> PassRefPtr<Database> DatabaseManager::openDatabase(ScriptExecutionContext* context,
</span><span class="cx"> const String& name, const String& expectedVersion, const String& displayName,
</span><span class="cx"> unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback,
</span><span class="lines">@@ -351,6 +377,12 @@
</span><span class="cx">
</span><span class="cx"> String DatabaseManager::fullPathForDatabase(SecurityOrigin* origin, const String& name, bool createIfDoesNotExist)
</span><span class="cx"> {
</span><ins>+ {
+ MutexLocker locker(m_lock);
+ for (HashSet<ProposedDatabase*>::iterator iter = m_proposedDatabases.begin(); iter != m_proposedDatabases.end(); ++iter)
+ if ((*iter)->details().name() == name && (*iter)->origin()->equal(origin))
+ return String();
+ }
</ins><span class="cx"> return m_server->fullPathForDatabase(origin, name, createIfDoesNotExist);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -371,6 +403,14 @@
</span><span class="cx">
</span><span class="cx"> DatabaseDetails DatabaseManager::detailsForNameAndOrigin(const String& name, SecurityOrigin* origin)
</span><span class="cx"> {
</span><ins>+ {
+ MutexLocker locker(m_lock);
+ for (HashSet<ProposedDatabase*>::iterator iter = m_proposedDatabases.begin(); iter != m_proposedDatabases.end(); ++iter)
+ if ((*iter)->details().name() == name && (*iter)->origin()->equal(origin)) {
+ ASSERT((*iter)->details().thread() == currentThread() || isMainThread());
+ return (*iter)->details();
+ }
+ }
</ins><span class="cx"> return m_server->detailsForNameAndOrigin(name, origin);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreModuleswebdatabaseDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h (163883 => 163884)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2014-02-11 17:36:10 UTC (rev 163883)
+++ branches/safari-537.75-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2014-02-11 17:49:30 UTC (rev 163884)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "DatabaseError.h"
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><span class="lines">@@ -106,6 +107,21 @@
</span><span class="cx"> void interruptAllDatabasesForContext(ScriptExecutionContext*);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ class ProposedDatabase {
+ public:
+ ProposedDatabase(DatabaseManager&, SecurityOrigin*,
+ const String& name, const String& displayName, unsigned long estimatedSize);
+ ~ProposedDatabase();
+
+ SecurityOrigin* origin() { return m_origin.get(); }
+ DatabaseDetails& details() { return m_details; }
+
+ private:
+ DatabaseManager& m_manager;
+ RefPtr<SecurityOrigin> m_origin;
+ DatabaseDetails m_details;
+ };
+
</ins><span class="cx"> DatabaseManager();
</span><span class="cx"> ~DatabaseManager() { }
</span><span class="cx">
</span><span class="lines">@@ -117,20 +133,26 @@
</span><span class="cx"> DatabaseType, const String& name, const String& expectedVersion, const String& displayName,
</span><span class="cx"> unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
</span><span class="cx">
</span><ins>+ void addProposedDatabase(ProposedDatabase*);
+ void removeProposedDatabase(ProposedDatabase*);
+
</ins><span class="cx"> static void logErrorMessage(ScriptExecutionContext*, const String& message);
</span><span class="cx">
</span><span class="cx"> AbstractDatabaseServer* m_server;
</span><span class="cx"> DatabaseManagerClient* m_client;
</span><span class="cx"> bool m_databaseIsAvailable;
</span><span class="cx">
</span><del>- // Access to the following fields require locking m_contextMapLock:
</del><ins>+ // Access to the following fields require locking m_lock below:
</ins><span class="cx"> typedef HashMap<ScriptExecutionContext*, DatabaseContext*> ContextMap;
</span><span class="cx"> ContextMap m_contextMap;
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> int m_databaseContextRegisteredCount;
</span><span class="cx"> int m_databaseContextInstanceCount;
</span><span class="cx"> #endif
</span><del>- Mutex m_contextMapLock;
</del><ins>+ HashSet<ProposedDatabase*> m_proposedDatabases;
+
+ // This lock protects m_contextMap, and m_proposedDatabases.
+ Mutex m_lock;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>