Log Message
IDB related cleanup in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=124691
Reviewed by Enrica Casucci. - WebIDBServerConnection.cpp should use the WebCore namespace and get rid of "WebCore::" throughout - "backendIndentifier" should be renamed to "serverConnectionIdentifier" throughout * DatabaseProcess/DatabaseToWebProcessConnection.cpp: (WebKit::DatabaseToWebProcessConnection::establishIDBConnection): * DatabaseProcess/DatabaseToWebProcessConnection.h: * DatabaseProcess/DatabaseToWebProcessConnection.messages.in: * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp: (WebKit::DatabaseProcessIDBConnection::DatabaseProcessIDBConnection): * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h: (WebKit::DatabaseProcessIDBConnection::create): * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp: (WebKit::generateServerConnectionIdentifier): (WebKit::WebIDBServerConnection::WebIDBServerConnection): (WebKit::WebIDBServerConnection::openTransaction): (WebKit::WebIDBServerConnection::setIndexKeys): (WebKit::WebIDBServerConnection::createObjectStore): (WebKit::WebIDBServerConnection::createIndex): (WebKit::WebIDBServerConnection::deleteIndex): (WebKit::WebIDBServerConnection::get): (WebKit::WebIDBServerConnection::put): (WebKit::WebIDBServerConnection::openCursor): (WebKit::WebIDBServerConnection::count): (WebKit::WebIDBServerConnection::deleteRange): (WebKit::WebIDBServerConnection::clearObjectStore): (WebKit::WebIDBServerConnection::deleteObjectStore): (WebKit::WebIDBServerConnection::changeDatabaseVersion): (WebKit::WebIDBServerConnection::cursorAdvance): (WebKit::WebIDBServerConnection::cursorIterate): (WebKit::WebIDBServerConnection::cursorPrefetchIteration): (WebKit::WebIDBServerConnection::cursorPrefetchReset): * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
Modified Paths
- trunk/Source/WebKit2/ChangeLog
- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp
- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h
- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.messages.in
- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h
- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp
- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159597 => 159598)
--- trunk/Source/WebKit2/ChangeLog 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-21 01:28:35 UTC (rev 159598)
@@ -1,5 +1,47 @@
2013-11-20 Brady Eidson <beid...@apple.com>
+ IDB related cleanup in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=124691
+
+ Reviewed by Enrica Casucci.
+
+ - WebIDBServerConnection.cpp should use the WebCore namespace and get rid of "WebCore::" throughout
+ - "backendIndentifier" should be renamed to "serverConnectionIdentifier" throughout
+
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ (WebKit::DatabaseToWebProcessConnection::establishIDBConnection):
+ * DatabaseProcess/DatabaseToWebProcessConnection.h:
+ * DatabaseProcess/DatabaseToWebProcessConnection.messages.in:
+
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::DatabaseProcessIDBConnection):
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ (WebKit::DatabaseProcessIDBConnection::create):
+
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::generateServerConnectionIdentifier):
+ (WebKit::WebIDBServerConnection::WebIDBServerConnection):
+ (WebKit::WebIDBServerConnection::openTransaction):
+ (WebKit::WebIDBServerConnection::setIndexKeys):
+ (WebKit::WebIDBServerConnection::createObjectStore):
+ (WebKit::WebIDBServerConnection::createIndex):
+ (WebKit::WebIDBServerConnection::deleteIndex):
+ (WebKit::WebIDBServerConnection::get):
+ (WebKit::WebIDBServerConnection::put):
+ (WebKit::WebIDBServerConnection::openCursor):
+ (WebKit::WebIDBServerConnection::count):
+ (WebKit::WebIDBServerConnection::deleteRange):
+ (WebKit::WebIDBServerConnection::clearObjectStore):
+ (WebKit::WebIDBServerConnection::deleteObjectStore):
+ (WebKit::WebIDBServerConnection::changeDatabaseVersion):
+ (WebKit::WebIDBServerConnection::cursorAdvance):
+ (WebKit::WebIDBServerConnection::cursorIterate):
+ (WebKit::WebIDBServerConnection::cursorPrefetchIteration):
+ (WebKit::WebIDBServerConnection::cursorPrefetchReset):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+
+2013-11-20 Brady Eidson <beid...@apple.com>
+
Add argument coders for IDBDatabaseMetadata classes
https://bugs.webkit.org/show_bug.cgi?id=124689
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp (159597 => 159598)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2013-11-21 01:28:35 UTC (rev 159598)
@@ -79,10 +79,10 @@
}
-void DatabaseToWebProcessConnection::establishIDBConnection(uint64_t backendIdentifier)
+void DatabaseToWebProcessConnection::establishIDBConnection(uint64_t serverConnectionIdentifier)
{
- RefPtr<DatabaseProcessIDBConnection> connection = DatabaseProcessIDBConnection::create(backendIdentifier);
- m_idbConnections.set(backendIdentifier, connection.release());
+ RefPtr<DatabaseProcessIDBConnection> connection = DatabaseProcessIDBConnection::create(serverConnectionIdentifier);
+ m_idbConnections.set(serverConnectionIdentifier, connection.release());
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h (159597 => 159598)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2013-11-21 01:28:35 UTC (rev 159598)
@@ -59,7 +59,7 @@
#if ENABLE(INDEXED_DATABASE)
// Messages handlers
- void establishIDBConnection(uint64_t backendIdentifier);
+ void establishIDBConnection(uint64_t serverConnectionIdentifier);
typedef HashMap<uint64_t, RefPtr<DatabaseProcessIDBConnection>> IDBConnectionMap;
IDBConnectionMap m_idbConnections;
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.messages.in (159597 => 159598)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.messages.in 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.messages.in 2013-11-21 01:28:35 UTC (rev 159598)
@@ -25,7 +25,7 @@
messages -> DatabaseToWebProcessConnection LegacyReceiver {
#if ENABLE(INDEXED_DATABASE)
# Creates a connection for communication with a WebProcess
- EstablishIDBConnection(uint64_t backendIdentifier)
+ EstablishIDBConnection(uint64_t serverConnectionIdentifier)
#endif
}
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (159597 => 159598)
--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-11-21 01:28:35 UTC (rev 159598)
@@ -32,8 +32,8 @@
namespace WebKit {
-DatabaseProcessIDBConnection::DatabaseProcessIDBConnection(uint64_t backendIdentifier)
- : m_backendIdentifier(backendIdentifier)
+DatabaseProcessIDBConnection::DatabaseProcessIDBConnection(uint64_t serverConnectionIdentifier)
+ : m_serverConnectionIdentifier(serverConnectionIdentifier)
{
}
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h (159597 => 159598)
--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-11-21 01:28:35 UTC (rev 159598)
@@ -38,9 +38,9 @@
class DatabaseProcessIDBConnection : public RefCounted<DatabaseProcessIDBConnection>, public CoreIPC::MessageSender {
public:
- static RefPtr<DatabaseProcessIDBConnection> create(uint64_t backendIdentifier)
+ static RefPtr<DatabaseProcessIDBConnection> create(uint64_t serverConnectionIdentifier)
{
- return adoptRef(new DatabaseProcessIDBConnection(backendIdentifier));
+ return adoptRef(new DatabaseProcessIDBConnection(serverConnectionIdentifier));
}
virtual ~DatabaseProcessIDBConnection();
@@ -49,18 +49,18 @@
void didReceiveDatabaseProcessIDBConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
private:
- DatabaseProcessIDBConnection(uint64_t backendIdentifier);
+ DatabaseProcessIDBConnection(uint64_t serverConnectionIdentifier);
// CoreIPC::MessageSender
virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
- virtual uint64_t messageSenderDestinationID() OVERRIDE { return m_backendIdentifier; }
+ virtual uint64_t messageSenderDestinationID() OVERRIDE { return m_serverConnectionIdentifier; }
// Message handlers.
void establishConnection(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin);
void getOrEstablishIDBDatabaseMetadata();
RefPtr<DatabaseToWebProcessConnection> m_connection;
- uint64_t m_backendIdentifier;
+ uint64_t m_serverConnectionIdentifier;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (159597 => 159598)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-11-21 01:28:35 UTC (rev 159598)
@@ -37,22 +37,24 @@
#include <WebCore/SecurityOrigin.h>
+using namespace WebCore;
+
namespace WebKit {
-static uint64_t generateBackendIdentifier()
+static uint64_t generateServerConnectionIdentifier()
{
ASSERT(isMainThread());
DEFINE_STATIC_LOCAL(uint64_t, identifier, (0));
return ++identifier;
}
-WebIDBServerConnection::WebIDBServerConnection(const String& databaseName, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin)
- : m_backendIdentifier(generateBackendIdentifier())
+WebIDBServerConnection::WebIDBServerConnection(const String& databaseName, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin)
+ : m_serverConnectionIdentifier(generateServerConnectionIdentifier())
, m_databaseName(databaseName)
, m_openingOrigin(*openingOrigin.isolatedCopy())
, m_mainFrameOrigin(*mainFrameOrigin.isolatedCopy())
{
- send(Messages::DatabaseToWebProcessConnection::EstablishIDBConnection(m_backendIdentifier));
+ send(Messages::DatabaseToWebProcessConnection::EstablishIDBConnection(m_serverConnectionIdentifier));
send(Messages::DatabaseProcessIDBConnection::EstablishConnection(databaseName, SecurityOriginData::fromSecurityOrigin(&openingOrigin), SecurityOriginData::fromSecurityOrigin(&mainFrameOrigin)));
}
@@ -78,7 +80,7 @@
{
}
-void WebIDBServerConnection::openTransaction(int64_t transactionID, const HashSet<int64_t>& objectStoreIds, WebCore::IndexedDB::TransactionMode, BoolCallbackFunction successCallback)
+void WebIDBServerConnection::openTransaction(int64_t transactionID, const HashSet<int64_t>& objectStoreIds, IndexedDB::TransactionMode, BoolCallbackFunction successCallback)
{
}
@@ -98,67 +100,67 @@
{
}
-void WebIDBServerConnection::setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const WebCore::IDBObjectStoreMetadata&, WebCore::IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<WebCore::IDBKey>>>& indexKeys, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>>& indexKeys, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::createObjectStore(WebCore::IDBTransactionBackend&, const WebCore::CreateObjectStoreOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::createObjectStore(IDBTransactionBackend&, const CreateObjectStoreOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::createIndex(WebCore::IDBTransactionBackend&, const WebCore::CreateIndexOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::createIndex(IDBTransactionBackend&, const CreateIndexOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::deleteIndex(WebCore::IDBTransactionBackend&, const WebCore::DeleteIndexOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::deleteIndex(IDBTransactionBackend&, const DeleteIndexOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::get(WebCore::IDBTransactionBackend&, const WebCore::GetOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::get(IDBTransactionBackend&, const GetOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::put(WebCore::IDBTransactionBackend&, const WebCore::PutOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::put(IDBTransactionBackend&, const PutOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::openCursor(WebCore::IDBTransactionBackend&, const WebCore::OpenCursorOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::openCursor(IDBTransactionBackend&, const OpenCursorOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::count(WebCore::IDBTransactionBackend&, const WebCore::CountOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::count(IDBTransactionBackend&, const CountOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::deleteRange(WebCore::IDBTransactionBackend&, const WebCore::DeleteRangeOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::deleteRange(IDBTransactionBackend&, const DeleteRangeOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::clearObjectStore(WebCore::IDBTransactionBackend&, const WebCore::ClearObjectStoreOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::clearObjectStore(IDBTransactionBackend&, const ClearObjectStoreOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::deleteObjectStore(WebCore::IDBTransactionBackend&, const WebCore::DeleteObjectStoreOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::deleteObjectStore(IDBTransactionBackend&, const DeleteObjectStoreOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::changeDatabaseVersion(WebCore::IDBTransactionBackend&, const WebCore::IDBDatabaseBackend::VersionChangeOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback)
+void WebIDBServerConnection::changeDatabaseVersion(IDBTransactionBackend&, const IDBDatabaseBackend::VersionChangeOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
{
}
-void WebIDBServerConnection::cursorAdvance(WebCore::IDBCursorBackend&, const WebCore::CursorAdvanceOperation&, std::function<void()> completionCallback)
+void WebIDBServerConnection::cursorAdvance(IDBCursorBackend&, const CursorAdvanceOperation&, std::function<void()> completionCallback)
{
}
-void WebIDBServerConnection::cursorIterate(WebCore::IDBCursorBackend&, const WebCore::CursorIterationOperation&, std::function<void()> completionCallback)
+void WebIDBServerConnection::cursorIterate(IDBCursorBackend&, const CursorIterationOperation&, std::function<void()> completionCallback)
{
}
-void WebIDBServerConnection::cursorPrefetchIteration(WebCore::IDBCursorBackend&, const WebCore::CursorPrefetchIterationOperation&, std::function<void()> completionCallback)
+void WebIDBServerConnection::cursorPrefetchIteration(IDBCursorBackend&, const CursorPrefetchIterationOperation&, std::function<void()> completionCallback)
{
}
-void WebIDBServerConnection::cursorPrefetchReset(WebCore::IDBCursorBackend&, int usedPrefetches)
+void WebIDBServerConnection::cursorPrefetchReset(IDBCursorBackend&, int usedPrefetches)
{
}
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h (159597 => 159598)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2013-11-21 01:11:28 UTC (rev 159597)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2013-11-21 01:28:35 UTC (rev 159598)
@@ -86,9 +86,9 @@
// CoreIPC::MessageSender
virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
- virtual uint64_t messageSenderDestinationID() OVERRIDE { return m_backendIdentifier; }
+ virtual uint64_t messageSenderDestinationID() OVERRIDE { return m_serverConnectionIdentifier; }
- uint64_t m_backendIdentifier;
+ uint64_t m_serverConnectionIdentifier;
String m_databaseName;
Ref<WebCore::SecurityOrigin> m_openingOrigin;
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
