<!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>[159737] trunk/Source</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/159737">159737</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2013-11-24 15:12:28 -0800 (Sun, 24 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>DatabaseProcess: Add "UniqueIDBDatabase" that multiple WebProcesses can connect to
https://bugs.webkit.org/show_bug.cgi?id=124819
Reviewed by Dan Bernstein.
Source/WebCore:
* Modules/indexeddb/IDBDatabaseBackend.cpp:
(WebCore::IDBDatabaseBackend::~IDBDatabaseBackend): Unregister from the IDBFactory.
Source/WebKit2:
UniqueIDBDatabase instances are per-DatabaseProcess, so it manages the set of them.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::getOrCreateUniqueIDBDatabase):
(WebKit::DatabaseProcess::removeUniqueIDBDatabase):
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseToWebProcessConnection.h:
Start forwarding things along to the appropriate UniqueIDBDatabase.
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::~DatabaseProcessIDBConnection):
(WebKit::DatabaseProcessIDBConnection::disconnectedFromWebProcess):
(WebKit::DatabaseProcessIDBConnection::establishConnection):
(WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
A class that represents a single concrete IDB database that multiple WebProcesses can connect to.
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::UniqueIDBDatabase):
(WebKit::UniqueIDBDatabase::~UniqueIDBDatabase):
(WebKit::UniqueIDBDatabase::registerConnection):
(WebKit::UniqueIDBDatabase::unregisterConnection):
(WebKit::UniqueIDBDatabase::getIDBDatabaseMetadata):
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
(WebKit::UniqueIDBDatabase::create):
(WebKit::UniqueIDBDatabase::identifier):
A class to help uniquely identify an IDBDatabase that can be expanded as needed.
Importantly, it knows how to be used as a key in a HashMap.
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp: Added.
(WebKit::UniqueIDBDatabaseIdentifier::UniqueIDBDatabaseIdentifier):
(WebKit::UniqueIDBDatabaseIdentifier::isHashTableDeletedValue):
(WebKit::UniqueIDBDatabaseIdentifier::hash):
(WebKit::UniqueIDBDatabaseIdentifier::isNull):
(WebKit::operator==):
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h: Added.
(WebKit::UniqueIDBDatabaseIdentifier::databaseName):
(WebKit::UniqueIDBDatabaseIdentifier::openingOrigin):
(WebKit::UniqueIDBDatabaseIdentifier::mainFrameOrigin):
(WebKit::UniqueIDBDatabaseIdentifierHash::hash):
(WebKit::UniqueIDBDatabaseIdentifierHash::equal):
(WebKit::UniqueIDBDatabaseIdentifierHashTraits::isEmptyValue):
* Shared/SecurityOriginData.cpp:
(WebKit::operator==):
* Shared/SecurityOriginData.h:
* UIProcess/WebContext.cpp:
* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp:
(WebKit::WebIDBFactoryBackend::open):
(WebKit::WebIDBFactoryBackend::removeIDBDatabaseBackend):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendcpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectionh">trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatacpp">trunk/Source/WebKit2/Shared/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatah">trunk/Source/WebKit2/Shared/SecurityOriginData.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifiercpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifierh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebCore/ChangeLog 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-11-24 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess: Add "UniqueIDBDatabase" that multiple WebProcesses can connect to
+ https://bugs.webkit.org/show_bug.cgi?id=124819
+
+ Reviewed by Dan Bernstein.
+
+ * Modules/indexeddb/IDBDatabaseBackend.cpp:
+ (WebCore::IDBDatabaseBackend::~IDBDatabaseBackend): Unregister from the IDBFactory.
+
</ins><span class="cx"> 2013-11-24 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Generate toHTMLMarquee|OListElement() to cleanup static_cast<>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx">
</span><span class="cx"> IDBDatabaseBackend::~IDBDatabaseBackend()
</span><span class="cx"> {
</span><ins>+ m_factory->removeIDBDatabaseBackend(m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBDatabaseBackend::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
</span><span class="lines">@@ -447,7 +448,6 @@
</span><span class="cx"> processPendingCalls();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void IDBDatabaseBackend::openConnectionInternal(PassRefPtr<IDBCallbacks> prpCallbacks, PassRefPtr<IDBDatabaseCallbacks> prpDatabaseCallbacks, int64_t transactionId, uint64_t version)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pendingDeleteCalls.isEmpty());
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2013-11-24 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess: Add "UniqueIDBDatabase" that multiple WebProcesses can connect to
+ https://bugs.webkit.org/show_bug.cgi?id=124819
+
+ Reviewed by Dan Bernstein.
+
+ UniqueIDBDatabase instances are per-DatabaseProcess, so it manages the set of them.
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::getOrCreateUniqueIDBDatabase):
+ (WebKit::DatabaseProcess::removeUniqueIDBDatabase):
+ * DatabaseProcess/DatabaseProcess.h:
+
+ * DatabaseProcess/DatabaseToWebProcessConnection.h:
+
+ Start forwarding things along to the appropriate UniqueIDBDatabase.
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::~DatabaseProcessIDBConnection):
+ (WebKit::DatabaseProcessIDBConnection::disconnectedFromWebProcess):
+ (WebKit::DatabaseProcessIDBConnection::establishConnection):
+ (WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata):
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+
+ A class that represents a single concrete IDB database that multiple WebProcesses can connect to.
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::UniqueIDBDatabase):
+ (WebKit::UniqueIDBDatabase::~UniqueIDBDatabase):
+ (WebKit::UniqueIDBDatabase::registerConnection):
+ (WebKit::UniqueIDBDatabase::unregisterConnection):
+ (WebKit::UniqueIDBDatabase::getIDBDatabaseMetadata):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+ (WebKit::UniqueIDBDatabase::create):
+ (WebKit::UniqueIDBDatabase::identifier):
+
+ A class to help uniquely identify an IDBDatabase that can be expanded as needed.
+ Importantly, it knows how to be used as a key in a HashMap.
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp: Added.
+ (WebKit::UniqueIDBDatabaseIdentifier::UniqueIDBDatabaseIdentifier):
+ (WebKit::UniqueIDBDatabaseIdentifier::isHashTableDeletedValue):
+ (WebKit::UniqueIDBDatabaseIdentifier::hash):
+ (WebKit::UniqueIDBDatabaseIdentifier::isNull):
+ (WebKit::operator==):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h: Added.
+ (WebKit::UniqueIDBDatabaseIdentifier::databaseName):
+ (WebKit::UniqueIDBDatabaseIdentifier::openingOrigin):
+ (WebKit::UniqueIDBDatabaseIdentifier::mainFrameOrigin):
+ (WebKit::UniqueIDBDatabaseIdentifierHash::hash):
+ (WebKit::UniqueIDBDatabaseIdentifierHash::equal):
+ (WebKit::UniqueIDBDatabaseIdentifierHashTraits::isEmptyValue):
+
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::operator==):
+ * Shared/SecurityOriginData.h:
+
+ * UIProcess/WebContext.cpp:
+
+ * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp:
+ (WebKit::WebIDBFactoryBackend::open):
+ (WebKit::WebIDBFactoryBackend::removeIDBDatabaseBackend):
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2013-11-24 Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>, Arunprasad Rajkumar <arurajku@cisco.com>
</span><span class="cx">
</span><span class="cx"> [WK2][GTK] Adding SpatialNavigation setting to webkit2
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "DatabaseProcessCreationParameters.h"
</span><span class="cx"> #include "DatabaseProcessProxyMessages.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><ins>+#include "UniqueIDBDatabase.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="lines">@@ -68,6 +69,27 @@
</span><span class="cx"> RunLoop::current()->stop();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<UniqueIDBDatabase> DatabaseProcess::getOrCreateUniqueIDBDatabase(const UniqueIDBDatabaseIdentifier& identifier)
+{
+ auto addResult = m_idbDatabases.add(identifier, nullptr);
+
+ if (!addResult.isNewEntry)
+ return addResult.iterator->value;
+
+ RefPtr<UniqueIDBDatabase> database = UniqueIDBDatabase::create(identifier);
+ addResult.iterator->value = database.get();
+ return database.release();
+}
+
+void DatabaseProcess::removeUniqueIDBDatabase(const UniqueIDBDatabase& database)
+{
+ const UniqueIDBDatabaseIdentifier& identifier = database.identifier();
+ ASSERT(m_idbDatabases.contains(identifier));
+
+ // FIXME: Perform necessary shut down of the unique database before it is actually destroyed.
+ m_idbDatabases.remove(identifier);
+}
+
</ins><span class="cx"> void DatabaseProcess::initializeDatabaseProcess(const DatabaseProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> m_indexedDatabaseDirectory = parameters.indexedDatabaseDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -29,10 +29,12 @@
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="cx"> #include "ChildProcess.h"
</span><ins>+#include "UniqueIDBDatabaseIdentifier.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DatabaseToWebProcessConnection;
</span><ins>+class UniqueIDBDatabase;
</ins><span class="cx">
</span><span class="cx"> struct DatabaseProcessCreationParameters;
</span><span class="cx">
</span><span class="lines">@@ -43,6 +45,9 @@
</span><span class="cx">
</span><span class="cx"> const String& indexedDatabaseDirectory() const { return m_indexedDatabaseDirectory; }
</span><span class="cx">
</span><ins>+ PassRefPtr<UniqueIDBDatabase> getOrCreateUniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
+ void removeUniqueIDBDatabase(const UniqueIDBDatabase&);
+
</ins><span class="cx"> private:
</span><span class="cx"> DatabaseProcess();
</span><span class="cx"> ~DatabaseProcess();
</span><span class="lines">@@ -66,6 +71,8 @@
</span><span class="cx"> Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
</span><span class="cx">
</span><span class="cx"> String m_indexedDatabaseDirectory;
</span><ins>+
+ HashMap<UniqueIDBDatabaseIdentifier, RefPtr<UniqueIDBDatabase>> m_idbDatabases;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define DatabaseToWebProcessConnection_h
</span><span class="cx">
</span><span class="cx"> #include "Connection.h"
</span><ins>+#include "DatabaseProcessIDBConnection.h"
</ins><span class="cx"> #include "MessageSender.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -35,8 +36,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class DatabaseProcessIDBConnection;
-
</del><span class="cx"> class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public CoreIPC::Connection::Client, public CoreIPC::MessageSender {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<DatabaseToWebProcessConnection> create(CoreIPC::Connection::Identifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -28,7 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include "DatabaseProcess.h"
</ins><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><ins>+#include "UniqueIDBDatabase.h"
</ins><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebIDBServerConnectionMessages.h"
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><span class="lines">@@ -45,32 +47,29 @@
</span><span class="cx">
</span><span class="cx"> DatabaseProcessIDBConnection::~DatabaseProcessIDBConnection()
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_uniqueIDBDatabase);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessIDBConnection::disconnectedFromWebProcess()
</span><span class="cx"> {
</span><del>- // Do any necessary cleanup work here.
</del><ins>+ m_uniqueIDBDatabase->unregisterConnection(*this);
+ m_uniqueIDBDatabase.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessIDBConnection::establishConnection(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin)
</span><span class="cx"> {
</span><del>- // This method should only be called once, so the stored database name should still be null.
- // Also, it is invalid to set the stored database name to the null string.
- ASSERT(m_databaseName.isNull());
- ASSERT(!databaseName.isNull());
-
- m_databaseName = databaseName;
- m_openingOrigin = openingOrigin;
- m_mainFrameOrigin = mainFrameOrigin;
</del><ins>+ m_uniqueIDBDatabase = DatabaseProcess::shared().getOrCreateUniqueIDBDatabase(UniqueIDBDatabaseIdentifier(databaseName, openingOrigin, mainFrameOrigin));
+ m_uniqueIDBDatabase->registerConnection(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata(uint64_t requestID)
</span><span class="cx"> {
</span><del>- // FIXME: This method is successfully called by messaging from the WebProcess, and calls back with dummy data.
- // Needs real implementation.
</del><ins>+ ASSERT(m_uniqueIDBDatabase);
</ins><span class="cx">
</span><del>- IDBDatabaseMetadata data;
- send(Messages::WebIDBServerConnection::DidGetOrEstablishIDBDatabaseMetadata(requestID, false, data));
</del><ins>+ RefPtr<DatabaseProcessIDBConnection> connection(this);
+ m_uniqueIDBDatabase->getIDBDatabaseMetadata([connection, requestID](bool success, const IDBDatabaseMetadata& metadata) {
+ connection->send(Messages::WebIDBServerConnection::DidGetOrEstablishIDBDatabaseMetadata(requestID, success, metadata));
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CoreIPC::Connection* DatabaseProcessIDBConnection::messageSenderConnection()
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -31,11 +31,13 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="cx"> #include "SecurityOriginData.h"
</span><ins>+#include "UniqueIDBDatabaseIdentifier.h"
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DatabaseToWebProcessConnection;
</span><ins>+class UniqueIDBDatabase;
</ins><span class="cx">
</span><span class="cx"> class DatabaseProcessIDBConnection : public RefCounted<DatabaseProcessIDBConnection>, public CoreIPC::MessageSender {
</span><span class="cx"> public:
</span><span class="lines">@@ -65,9 +67,7 @@
</span><span class="cx"> Ref<DatabaseToWebProcessConnection> m_connection;
</span><span class="cx"> uint64_t m_serverConnectionIdentifier;
</span><span class="cx">
</span><del>- String m_databaseName;
- SecurityOriginData m_openingOrigin;
- SecurityOriginData m_mainFrameOrigin;
</del><ins>+ RefPtr<UniqueIDBDatabase> m_uniqueIDBDatabase;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecppfromrev159736trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (from rev 159736, trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp) (0 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * 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. 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 INC. 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 "UniqueIDBDatabase.h"
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include "DatabaseProcess.h"
+#include "DatabaseProcessIDBConnection.h"
+#include <WebCore/IDBDatabaseMetadata.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+UniqueIDBDatabase::UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier& identifier)
+ : m_identifier(identifier)
+{
+}
+
+UniqueIDBDatabase::~UniqueIDBDatabase()
+{
+}
+
+void UniqueIDBDatabase::registerConnection(DatabaseProcessIDBConnection& connection)
+{
+ ASSERT(!m_connections.contains(&connection));
+ m_connections.add(&connection);
+}
+
+void UniqueIDBDatabase::unregisterConnection(DatabaseProcessIDBConnection& connection)
+{
+ ASSERT(m_connections.contains(&connection));
+ m_connections.remove(&connection);
+
+ if (m_connections.isEmpty())
+ DatabaseProcess::shared().removeUniqueIDBDatabase(*this);
+}
+
+void UniqueIDBDatabase::getIDBDatabaseMetadata(std::function<void(bool, const WebCore::IDBDatabaseMetadata&)> completionCallback)
+{
+ // FIXME: This method is successfully called by messaging from the WebProcess, and calls back with dummy data.
+ // Needs real implementation.
+
+ IDBDatabaseMetadata metadata;
+ completionCallback(false, metadata);
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasehfromrev159736trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (from rev 159736, trunk/Source/WebKit2/Shared/SecurityOriginData.h) (0 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+/*
+ * 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. 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 INC. 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 UniqueIDBDatabase_h
+#define UniqueIDBDatabase_h
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include "UniqueIDBDatabaseIdentifier.h"
+#include <functional>
+#include <wtf/HashSet.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+struct IDBDatabaseMetadata;
+}
+
+namespace WebKit {
+
+class DatabaseProcessIDBConnection;
+
+struct SecurityOriginData;
+
+class UniqueIDBDatabase : public RefCounted<UniqueIDBDatabase> {
+public:
+ static PassRefPtr<UniqueIDBDatabase> create(const UniqueIDBDatabaseIdentifier& identifier)
+ {
+ return adoptRef(new UniqueIDBDatabase(identifier));
+ }
+
+ ~UniqueIDBDatabase();
+
+ const UniqueIDBDatabaseIdentifier& identifier() const { return m_identifier; }
+
+ void registerConnection(DatabaseProcessIDBConnection&);
+ void unregisterConnection(DatabaseProcessIDBConnection&);
+
+ void getIDBDatabaseMetadata(std::function<void(bool, const WebCore::IDBDatabaseMetadata&)> completionCallback);
+
+private:
+ UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
+
+ UniqueIDBDatabaseIdentifier m_identifier;
+
+ HashSet<RefPtr<DatabaseProcessIDBConnection>> m_connections;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // UniqueIDBDatabase_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifiercpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp (0 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+/*
+ * 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. 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 INC. 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 "UniqueIDBDatabaseIdentifier.h"
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include <wtf/text/StringBuilder.h>
+
+namespace WebKit {
+
+UniqueIDBDatabaseIdentifier::UniqueIDBDatabaseIdentifier()
+{
+}
+
+UniqueIDBDatabaseIdentifier::UniqueIDBDatabaseIdentifier(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin)
+ : m_databaseName(databaseName)
+ , m_openingOrigin(openingOrigin)
+ , m_mainFrameOrigin(mainFrameOrigin)
+{
+ // While it is valid to have an empty database name, it is not valid to have a null one.
+ ASSERT(!m_databaseName.isNull());
+}
+
+UniqueIDBDatabaseIdentifier::UniqueIDBDatabaseIdentifier(WTF::HashTableDeletedValueType)
+ : m_databaseName(WTF::HashTableDeletedValue)
+{
+}
+
+bool UniqueIDBDatabaseIdentifier::isHashTableDeletedValue() const
+{
+ return m_databaseName.isHashTableDeletedValue();
+}
+
+unsigned UniqueIDBDatabaseIdentifier::hash() const
+{
+ unsigned hashCodes[7] = {
+ m_databaseName.impl() ? m_databaseName.impl()->hash() : 0,
+ m_openingOrigin.protocol.impl() ? m_openingOrigin.protocol.impl()->hash() : 0,
+ m_openingOrigin.host.impl() ? m_openingOrigin.host.impl()->hash() : 0,
+ static_cast<unsigned>(m_openingOrigin.port),
+ m_mainFrameOrigin.protocol.impl() ? m_mainFrameOrigin.protocol.impl()->hash() : 0,
+ m_mainFrameOrigin.host.impl() ? m_mainFrameOrigin.host.impl()->hash() : 0,
+ static_cast<unsigned>(m_mainFrameOrigin.port)
+ };
+ return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
+}
+
+bool UniqueIDBDatabaseIdentifier::isNull() const
+{
+ // Only a default constructed UniqueIDBDatabaseIdentifier can have a null database name.
+ return m_databaseName.isNull();
+}
+
+bool operator==(const UniqueIDBDatabaseIdentifier& a, const UniqueIDBDatabaseIdentifier& b)
+{
+ if (&a == &b)
+ return true;
+
+ return a.databaseName() == b.databaseName()
+ && a.openingOrigin() == b.openingOrigin()
+ && a.mainFrameOrigin() == b.mainFrameOrigin();
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifierh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h (0 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+/*
+ * 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. 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 INC. 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 UniqueIDBDatabaseIdentifier_h
+#define UniqueIDBDatabaseIdentifier_h
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include "SecurityOriginData.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+class UniqueIDBDatabaseIdentifier {
+public:
+ UniqueIDBDatabaseIdentifier();
+ UniqueIDBDatabaseIdentifier(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin);
+
+ bool isNull() const;
+
+ const String& databaseName() const { return m_databaseName; }
+ const SecurityOriginData& openingOrigin() const { return m_openingOrigin; }
+ const SecurityOriginData& mainFrameOrigin() const { return m_mainFrameOrigin; }
+
+ UniqueIDBDatabaseIdentifier(WTF::HashTableDeletedValueType);
+ bool isHashTableDeletedValue() const;
+ unsigned hash() const;
+
+private:
+ String m_databaseName;
+ SecurityOriginData m_openingOrigin;
+ SecurityOriginData m_mainFrameOrigin;
+};
+
+bool operator==(const UniqueIDBDatabaseIdentifier&, const UniqueIDBDatabaseIdentifier&);
+
+struct UniqueIDBDatabaseIdentifierHash {
+ static unsigned hash(const UniqueIDBDatabaseIdentifier& identifier) { return identifier.hash(); }
+ static bool equal(const UniqueIDBDatabaseIdentifier& a, const UniqueIDBDatabaseIdentifier& b) { return a == b; }
+ static const bool safeToCompareToEmptyOrDeleted = false;
+};
+
+struct UniqueIDBDatabaseIdentifierHashTraits : WTF::SimpleClassHashTraits<UniqueIDBDatabaseIdentifier> {
+ static const bool hasIsEmptyValueFunction = true;
+ static bool isEmptyValue(const UniqueIDBDatabaseIdentifier& info) { return info.isNull(); }
+};
+
+} // namespace WebKit
+
+namespace WTF {
+
+template<> struct HashTraits<WebKit::UniqueIDBDatabaseIdentifier> : WebKit::UniqueIDBDatabaseIdentifierHashTraits { };
+template<> struct DefaultHash<WebKit::UniqueIDBDatabaseIdentifier> {
+ typedef WebKit::UniqueIDBDatabaseIdentifierHash Hash;
+};
+
+} // namespaec WTF
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // UniqueIDBDatabaseIdentifier_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -89,4 +89,14 @@
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::create(std::move(securityOrigins)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool operator==(const SecurityOriginData& a, const SecurityOriginData& b)
+{
+ if (&a == &b)
+ return true;
+
+ return a.protocol == b.protocol
+ && a.host == b.host
+ && a.port == b.port;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.h (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.h 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.h 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx">
</span><span class="cx"> void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>&, ArrayCallback*);
</span><span class="cx">
</span><ins>+bool operator==(const SecurityOriginData&, const SecurityOriginData&);
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // SecurityOriginData_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -539,6 +539,10 @@
</span><span class="cx"> 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E7726183DD6F60007203F /* AsyncRequest.h */; };
</span><span class="cx"> 515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */; };
</span><span class="cx"> 515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */; };
</span><ins>+ 515E772F184015800007203F /* UniqueIDBDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E772D184015800007203F /* UniqueIDBDatabase.cpp */; };
+ 515E7730184015800007203F /* UniqueIDBDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E772E184015800007203F /* UniqueIDBDatabase.h */; };
+ 515E773318402D510007203F /* UniqueIDBDatabaseIdentifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */; };
+ 515E773418402D510007203F /* UniqueIDBDatabaseIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */; };
</ins><span class="cx"> 5160BFE113381DF900918999 /* Logging.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* Logging.mac.mm */; };
</span><span class="cx"> 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
</span><span class="cx"> 5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
</span><span class="lines">@@ -2069,6 +2073,10 @@
</span><span class="cx"> 515E7726183DD6F60007203F /* AsyncRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessCreationParameters.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 515E772A184008B90007203F /* DatabaseProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseProcessCreationParameters.h; sourceTree = "<group>"; };
</span><ins>+ 515E772D184015800007203F /* UniqueIDBDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabase.cpp; sourceTree = "<group>"; };
+ 515E772E184015800007203F /* UniqueIDBDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabase.h; sourceTree = "<group>"; };
+ 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseIdentifier.cpp; sourceTree = "<group>"; };
+ 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseIdentifier.h; sourceTree = "<group>"; };
</ins><span class="cx"> 5160BFE013381DF900918999 /* Logging.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Logging.mac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 5167EE9E170377BF007681CA /* DiskCacheMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskCacheMonitor.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4057,6 +4065,10 @@
</span><span class="cx"> 51D0D42E183B34130097041D /* DatabaseProcessIDBConnection.cpp */,
</span><span class="cx"> 51D0D42F183B34130097041D /* DatabaseProcessIDBConnection.h */,
</span><span class="cx"> 51D0D430183B34130097041D /* DatabaseProcessIDBConnection.messages.in */,
</span><ins>+ 515E772D184015800007203F /* UniqueIDBDatabase.cpp */,
+ 515E772E184015800007203F /* UniqueIDBDatabase.h */,
+ 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */,
+ 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = IndexedDB;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -5536,6 +5548,7 @@
</span><span class="cx"> BC032DAB10F437D10058C15A /* Connection.h in Headers */,
</span><span class="cx"> 5136183E163126DA00A99DDE /* ConnectionStack.h in Headers */,
</span><span class="cx"> CDC3830C17212282008A2FC3 /* CookieStorageShimLibrary.h in Headers */,
</span><ins>+ 515E7730184015800007203F /* UniqueIDBDatabase.h in Headers */,
</ins><span class="cx"> B878B615133428DC006888E9 /* CorrectionPanel.h in Headers */,
</span><span class="cx"> 2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */,
</span><span class="cx"> 865E0485181A094A001F72F2 /* ViewState.h in Headers */,
</span><span class="lines">@@ -5758,6 +5771,7 @@
</span><span class="cx"> BC72B9FB11E6476B001EB4EA /* WebBackForwardListProxy.h in Headers */,
</span><span class="cx"> BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */,
</span><span class="cx"> BC032D7510F4378D0058C15A /* WebChromeClient.h in Headers */,
</span><ins>+ 515E773418402D510007203F /* UniqueIDBDatabaseIdentifier.h in Headers */,
</ins><span class="cx"> 3F87B9BE158940190090FF62 /* WebColorChooser.h in Headers */,
</span><span class="cx"> 3F87B9C0158940D80090FF62 /* WebColorPicker.h in Headers */,
</span><span class="cx"> BC4A6290147312BE006C681A /* WebConnection.h in Headers */,
</span><span class="lines">@@ -6842,8 +6856,10 @@
</span><span class="cx"> BC032DAA10F437D10058C15A /* Connection.cpp in Sources */,
</span><span class="cx"> 1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
</span><span class="cx"> 5136183D163126DA00A99DDE /* ConnectionStack.cpp in Sources */,
</span><ins>+ 515E773318402D510007203F /* UniqueIDBDatabaseIdentifier.cpp in Sources */,
</ins><span class="cx"> 2DA049B7180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp in Sources */,
</span><span class="cx"> 378E1A4D18208D700031007A /* WKNSURL.mm in Sources */,
</span><ins>+ 515E772F184015800007203F /* UniqueIDBDatabase.cpp in Sources */,
</ins><span class="cx"> 2DA049B3180CCCD300AAFA9E /* PlatformCALayerRemote.cpp in Sources */,
</span><span class="cx"> CDC3831017212440008A2FC3 /* CookieStorageShim.cpp in Sources */,
</span><span class="cx"> B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp (159736 => 159737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2013-11-24 21:46:43 UTC (rev 159736)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2013-11-24 23:12:28 UTC (rev 159737)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-typedef HashMap<String, RefPtr<IDBDatabaseBackend>> IDBDatabaseBackendMap;
</del><ins>+typedef HashMap<String, IDBDatabaseBackend*> IDBDatabaseBackendMap;
</ins><span class="cx">
</span><span class="cx"> static IDBDatabaseBackendMap& sharedDatabaseBackendMap()
</span><span class="cx"> {
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if (it == sharedDatabaseBackendMap().end()) {
</span><span class="cx"> RefPtr<IDBServerConnection> serverConnection = WebIDBServerConnection::create(databaseName, openingOrigin, mainFrameOrigin);
</span><span class="cx"> databaseBackend = IDBDatabaseBackend::create(databaseName, databaseIdentifier, this, *serverConnection);
</span><del>- sharedDatabaseBackendMap().set(databaseIdentifier, databaseBackend);
</del><ins>+ sharedDatabaseBackendMap().set(databaseIdentifier, databaseBackend.get());
</ins><span class="cx"> } else
</span><span class="cx"> databaseBackend = it->value;
</span><span class="cx">
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBFactoryBackend::removeIDBDatabaseBackend(const String&)
</del><ins>+void WebIDBFactoryBackend::removeIDBDatabaseBackend(const String& identifier)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ sharedDatabaseBackendMap().remove(identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>