Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (204017 => 204018)
--- trunk/Source/WebCore/CMakeLists.txt 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-08-02 07:19:58 UTC (rev 204018)
@@ -884,6 +884,7 @@
Modules/indexeddb/shared/IDBCursorInfo.cpp
Modules/indexeddb/shared/IDBDatabaseInfo.cpp
Modules/indexeddb/shared/IDBError.cpp
+ Modules/indexeddb/shared/IDBGetRecordData.cpp
Modules/indexeddb/shared/IDBIndexInfo.cpp
Modules/indexeddb/shared/IDBObjectStoreInfo.cpp
Modules/indexeddb/shared/IDBRequestData.cpp
Modified: trunk/Source/WebCore/ChangeLog (204017 => 204018)
--- trunk/Source/WebCore/ChangeLog 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/ChangeLog 2016-08-02 07:19:58 UTC (rev 204018)
@@ -1,3 +1,58 @@
+2016-08-02 Brady Eidson <[email protected]>
+
+ Refactor data passed along for a "GetRecord" request.
+ https://bugs.webkit.org/show_bug.cgi?id=160352
+
+ Reviewed by Tim Horton.
+
+ No new tests (No behavior change).
+
+ Adding this new object lets us easily add new data passed along for GetRecord
+ requests going forward.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * CMakeLists.txt:
+
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::get):
+
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::requestGetRecord):
+ (WebCore::IDBTransaction::requestIndexRecord):
+ (WebCore::IDBTransaction::getRecordOnServer):
+ * Modules/indexeddb/IDBTransaction.h:
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::getRecord):
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::getRecord):
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+ * Modules/indexeddb/client/IDBConnectionToServerDelegate.h:
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::getRecord):
+ * Modules/indexeddb/server/IDBServer.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::getRecord):
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabaseTransaction::getRecord):
+ * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:
+
+ * Modules/indexeddb/shared/IDBGetRecordData.cpp: Added.
+ (WebCore::IDBGetRecordData::isolatedCopy):
+ * Modules/indexeddb/shared/IDBGetRecordData.h: Added.
+ (WebCore::IDBGetRecordData::encode):
+ (WebCore::IDBGetRecordData::decode):
+
+ * Modules/indexeddb/shared/InProcessIDBServer.cpp:
+ (WebCore::InProcessIDBServer::getRecord):
+ * Modules/indexeddb/shared/InProcessIDBServer.h:
+
2016-08-01 Youenn Fablet <[email protected]>
[Fetch API] Pass directly FetchRequest fetch options to ThreadableLoader
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -35,6 +35,7 @@
#include "IDBDatabase.h"
#include "IDBDatabaseException.h"
#include "IDBError.h"
+#include "IDBGetRecordData.h"
#include "IDBIndex.h"
#include "IDBKey.h"
#include "IDBKeyRangeData.h"
@@ -184,7 +185,7 @@
return nullptr;
}
- return m_transaction->requestGetRecord(execState, *this, idbKey.ptr());
+ return m_transaction->requestGetRecord(execState, *this, { idbKey.ptr() });
}
RefPtr<IDBRequest> IDBObjectStore::get(ExecState& execState, IDBKeyRange* keyRange, ExceptionCodeWithMessage& ec)
@@ -209,7 +210,7 @@
return nullptr;
}
- return m_transaction->requestGetRecord(execState, *this, keyRangeData);
+ return m_transaction->requestGetRecord(execState, *this, { keyRangeData });
}
RefPtr<IDBRequest> IDBObjectStore::add(ExecState& execState, JSValue value, JSValue key, ExceptionCodeWithMessage& ec)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -38,6 +38,7 @@
#include "IDBDatabaseException.h"
#include "IDBError.h"
#include "IDBEventDispatcher.h"
+#include "IDBGetRecordData.h"
#include "IDBIndex.h"
#include "IDBKeyData.h"
#include "IDBKeyRangeData.h"
@@ -729,11 +730,11 @@
request.didOpenOrIterateCursor(resultData);
}
-Ref<IDBRequest> IDBTransaction::requestGetRecord(ExecState& execState, IDBObjectStore& objectStore, const IDBKeyRangeData& keyRangeData)
+Ref<IDBRequest> IDBTransaction::requestGetRecord(ExecState& execState, IDBObjectStore& objectStore, const IDBGetRecordData& getRecordData)
{
LOG(IndexedDB, "IDBTransaction::requestGetRecord");
ASSERT(isActive());
- ASSERT(!keyRangeData.isNull);
+ ASSERT(!getRecordData.keyRangeData.isNull);
ASSERT(currentThread() == m_database->originThreadID());
RELEASE_ASSERT(scriptExecutionContext());
@@ -742,7 +743,7 @@
Ref<IDBRequest> request = IDBRequest::create(*scriptExecutionContext(), objectStore, *this);
addRequest(request.get());
- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, keyRangeData);
+ auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, getRecordData);
scheduleOperation(WTFMove(operation));
return request;
@@ -764,7 +765,7 @@
return requestIndexRecord(execState, index, IndexedDB::IndexRecordType::Key, range);
}
-Ref<IDBRequest> IDBTransaction::requestIndexRecord(ExecState& execState, IDBIndex& index, IndexedDB::IndexRecordType type, const IDBKeyRangeData&range)
+Ref<IDBRequest> IDBTransaction::requestIndexRecord(ExecState& execState, IDBIndex& index, IndexedDB::IndexRecordType type, const IDBKeyRangeData& range)
{
LOG(IndexedDB, "IDBTransaction::requestGetValue");
ASSERT(isActive());
@@ -777,18 +778,19 @@
Ref<IDBRequest> request = IDBRequest::createGet(*scriptExecutionContext(), index, type, *this);
addRequest(request.get());
- auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, range);
+ IDBGetRecordData getRecordData = { range };
+ auto operation = IDBClient::createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, getRecordData);
scheduleOperation(WTFMove(operation));
return request;
}
-void IDBTransaction::getRecordOnServer(IDBClient::TransactionOperation& operation, const IDBKeyRangeData& keyRange)
+void IDBTransaction::getRecordOnServer(IDBClient::TransactionOperation& operation, const IDBGetRecordData& getRecordData)
{
LOG(IndexedDB, "IDBTransaction::getRecordOnServer");
ASSERT(currentThread() == m_database->originThreadID());
- m_database->connectionProxy().getRecord(operation, keyRange);
+ m_database->connectionProxy().getRecord(operation, getRecordData);
}
void IDBTransaction::didGetRecordOnServer(IDBRequest& request, const IDBResultData& resultData)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -30,6 +30,8 @@
#include "EventTarget.h"
#include "IDBActiveDOMObject.h"
#include "IDBError.h"
+#include "IDBGetRecordData.h"
+#include "IDBKeyRangeData.h"
#include "IDBOpenDBRequest.h"
#include "IDBTransactionInfo.h"
#include "IndexedDB.h"
@@ -114,7 +116,7 @@
std::unique_ptr<IDBIndex> createIndex(IDBObjectStore&, const IDBIndexInfo&);
Ref<IDBRequest> requestPutOrAdd(JSC::ExecState&, IDBObjectStore&, IDBKey*, SerializedScriptValue&, IndexedDB::ObjectStoreOverwriteMode);
- Ref<IDBRequest> requestGetRecord(JSC::ExecState&, IDBObjectStore&, const IDBKeyRangeData&);
+ Ref<IDBRequest> requestGetRecord(JSC::ExecState&, IDBObjectStore&, const IDBGetRecordData&);
Ref<IDBRequest> requestDeleteRecord(JSC::ExecState&, IDBObjectStore&, const IDBKeyRangeData&);
Ref<IDBRequest> requestClearObjectStore(JSC::ExecState&, IDBObjectStore&);
Ref<IDBRequest> requestCount(JSC::ExecState&, IDBObjectStore&, const IDBKeyRangeData&);
@@ -177,7 +179,7 @@
void putOrAddOnServer(IDBClient::TransactionOperation&, RefPtr<IDBKey>, RefPtr<SerializedScriptValue>, const IndexedDB::ObjectStoreOverwriteMode&);
void didPutOrAddOnServer(IDBRequest&, const IDBResultData&);
- void getRecordOnServer(IDBClient::TransactionOperation&, const IDBKeyRangeData&);
+ void getRecordOnServer(IDBClient::TransactionOperation&, const IDBGetRecordData&);
void didGetRecordOnServer(IDBRequest&, const IDBResultData&);
void getCountOnServer(IDBClient::TransactionOperation&, const IDBKeyRangeData&);
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -30,6 +30,7 @@
#include "IDBCursorInfo.h"
#include "IDBDatabase.h"
+#include "IDBGetRecordData.h"
#include "IDBKeyRangeData.h"
#include "IDBOpenDBRequest.h"
#include "IDBRequestData.h"
@@ -164,12 +165,12 @@
callConnectionOnMainThread(&IDBConnectionToServer::putOrAdd, requestData, keyData, value, mode);
}
-void IDBConnectionProxy::getRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
+void IDBConnectionProxy::getRecord(TransactionOperation& operation, const IDBGetRecordData& getRecordData)
{
const IDBRequestData requestData(operation);
saveOperation(operation);
- callConnectionOnMainThread(&IDBConnectionToServer::getRecord, requestData, keyRange);
+ callConnectionOnMainThread(&IDBConnectionToServer::getRecord, requestData, getRecordData);
}
void IDBConnectionProxy::getCount(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -51,6 +51,8 @@
class ScriptExecutionContext;
class SecurityOrigin;
+struct IDBGetRecordData;
+
namespace IDBClient {
class IDBConnectionToServer;
@@ -71,7 +73,7 @@
void createIndex(TransactionOperation&, const IDBIndexInfo&);
void deleteIndex(TransactionOperation&, uint64_t objectStoreIdentifier, const String& indexName);
void putOrAdd(TransactionOperation&, IDBKeyData&&, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
- void getRecord(TransactionOperation&, const IDBKeyRangeData&);
+ void getRecord(TransactionOperation&, const IDBGetRecordData&);
void getCount(TransactionOperation&, const IDBKeyRangeData&);
void deleteRecord(TransactionOperation&, const IDBKeyRangeData&);
void openCursor(TransactionOperation&, const IDBCursorInfo&);
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -30,6 +30,7 @@
#include "IDBConnectionProxy.h"
#include "IDBDatabase.h"
+#include "IDBGetRecordData.h"
#include "IDBKeyRangeData.h"
#include "IDBOpenDBRequest.h"
#include "IDBRequestData.h"
@@ -171,13 +172,13 @@
m_proxy->completeOperation(resultData);
}
-void IDBConnectionToServer::getRecord(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
+void IDBConnectionToServer::getRecord(const IDBRequestData& requestData, const IDBGetRecordData& getRecordData)
{
LOG(IndexedDB, "IDBConnectionToServer::getRecord");
ASSERT(isMainThread());
- ASSERT(!keyRangeData.isNull);
+ ASSERT(!getRecordData.keyRangeData.isNull);
- m_delegate->getRecord(requestData, keyRangeData);
+ m_delegate->getRecord(requestData, getRecordData);
}
void IDBConnectionToServer::didGetRecord(const IDBResultData& resultData)
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -45,6 +45,8 @@
class IDBValue;
class SecurityOrigin;
+struct IDBGetRecordData;
+
namespace IDBClient {
class IDBConnectionToServer : public ThreadSafeRefCounted<IDBConnectionToServer> {
@@ -79,7 +81,7 @@
void putOrAdd(const IDBRequestData&, const IDBKeyData&, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
WEBCORE_EXPORT void didPutOrAdd(const IDBResultData&);
- void getRecord(const IDBRequestData&, const IDBKeyRangeData&);
+ void getRecord(const IDBRequestData&, const IDBGetRecordData&);
WEBCORE_EXPORT void didGetRecord(const IDBResultData&);
void getCount(const IDBRequestData&, const IDBKeyRangeData&);
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -40,6 +40,7 @@
class IDBTransactionInfo;
class IDBValue;
+struct IDBGetRecordData;
struct SecurityOriginData;
namespace IndexedDB {
@@ -66,7 +67,7 @@
virtual void createIndex(const IDBRequestData&, const IDBIndexInfo&) = 0;
virtual void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) = 0;
virtual void putOrAdd(const IDBRequestData&, const IDBKeyData&, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode) = 0;
- virtual void getRecord(const IDBRequestData&, const IDBKeyRangeData&) = 0;
+ virtual void getRecord(const IDBRequestData&, const IDBGetRecordData&) = 0;
virtual void getCount(const IDBRequestData&, const IDBKeyRangeData&) = 0;
virtual void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&) = 0;
virtual void openCursor(const IDBRequestData&, const IDBCursorInfo&) = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -259,7 +259,7 @@
transaction->putOrAdd(requestData, keyData, value, overwriteMode);
}
-void IDBServer::getRecord(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
+void IDBServer::getRecord(const IDBRequestData& requestData, const IDBGetRecordData& getRecordData)
{
LOG(IndexedDB, "IDBServer::getRecord");
@@ -267,7 +267,7 @@
if (!transaction)
return;
- transaction->getRecord(requestData, keyRangeData);
+ transaction->getRecord(requestData, getRecordData);
}
void IDBServer::getCount(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -46,6 +46,8 @@
class IDBRequestData;
class IDBValue;
+struct IDBGetRecordData;
+
namespace IDBServer {
class IDBBackingStoreTemporaryFileHandler;
@@ -70,7 +72,7 @@
WEBCORE_EXPORT void createIndex(const IDBRequestData&, const IDBIndexInfo&);
WEBCORE_EXPORT void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
WEBCORE_EXPORT void putOrAdd(const IDBRequestData&, const IDBKeyData&, const IDBValue&, IndexedDB::ObjectStoreOverwriteMode);
- WEBCORE_EXPORT void getRecord(const IDBRequestData&, const IDBKeyRangeData&);
+ WEBCORE_EXPORT void getRecord(const IDBRequestData&, const IDBGetRecordData&);
WEBCORE_EXPORT void getCount(const IDBRequestData&, const IDBKeyRangeData&);
WEBCORE_EXPORT void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&);
WEBCORE_EXPORT void openCursor(const IDBRequestData&, const IDBCursorInfo&);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -29,6 +29,7 @@
#if ENABLE(INDEXED_DATABASE)
#include "IDBCursorInfo.h"
+#include "IDBGetRecordData.h"
#include "IDBKeyRangeData.h"
#include "IDBResultData.h"
#include "IDBServer.h"
@@ -913,7 +914,7 @@
performKeyDataCallback(callbackIdentifier, error, resultKey);
}
-void UniqueIDBDatabase::getRecord(const IDBRequestData& requestData, const IDBKeyRangeData& range, GetResultCallback callback)
+void UniqueIDBDatabase::getRecord(const IDBRequestData& requestData, const IDBGetRecordData& getRecordData, GetResultCallback callback)
{
ASSERT(isMainThread());
LOG(IndexedDB, "(main) UniqueIDBDatabase::getRecord");
@@ -923,9 +924,9 @@
return;
if (uint64_t indexIdentifier = requestData.indexIdentifier())
- postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performGetIndexRecord, callbackID, requestData.transactionIdentifier(), requestData.objectStoreIdentifier(), indexIdentifier, requestData.indexRecordType(), range));
+ postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performGetIndexRecord, callbackID, requestData.transactionIdentifier(), requestData.objectStoreIdentifier(), indexIdentifier, requestData.indexRecordType(), getRecordData.keyRangeData));
else
- postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performGetRecord, callbackID, requestData.transactionIdentifier(), requestData.objectStoreIdentifier(), range));
+ postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performGetRecord, callbackID, requestData.transactionIdentifier(), requestData.objectStoreIdentifier(), getRecordData.keyRangeData));
}
void UniqueIDBDatabase::performGetRecord(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData& keyRangeData)
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -92,7 +92,7 @@
void createIndex(UniqueIDBDatabaseTransaction&, const IDBIndexInfo&, ErrorCallback);
void deleteIndex(UniqueIDBDatabaseTransaction&, uint64_t objectStoreIdentifier, const String& indexName, ErrorCallback);
void putOrAdd(const IDBRequestData&, const IDBKeyData&, const IDBValue&, IndexedDB::ObjectStoreOverwriteMode, KeyDataCallback);
- void getRecord(const IDBRequestData&, const IDBKeyRangeData&, GetResultCallback);
+ void getRecord(const IDBRequestData&, const IDBGetRecordData&, GetResultCallback);
void getCount(const IDBRequestData&, const IDBKeyRangeData&, CountCallback);
void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&, ErrorCallback);
void openCursor(const IDBRequestData&, const IDBCursorInfo&, GetResultCallback);
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -205,7 +205,7 @@
});
}
-void UniqueIDBDatabaseTransaction::getRecord(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
+void UniqueIDBDatabaseTransaction::getRecord(const IDBRequestData& requestData, const IDBGetRecordData& getRecordData)
{
LOG(IndexedDB, "UniqueIDBDatabaseTransaction::getRecord");
@@ -212,7 +212,7 @@
ASSERT(m_transactionInfo.identifier() == requestData.transactionIdentifier());
RefPtr<UniqueIDBDatabaseTransaction> protectedThis(this);
- m_databaseConnection->database().getRecord(requestData, keyRangeData, [this, protectedThis, requestData](const IDBError& error, const IDBGetResult& result) {
+ m_databaseConnection->database().getRecord(requestData, getRecordData, [this, protectedThis, requestData](const IDBError& error, const IDBGetResult& result) {
LOG(IndexedDB, "UniqueIDBDatabaseTransaction::getRecord (callback)");
if (error.isNull())
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -43,6 +43,7 @@
class IDBRequestData;
class IDBValue;
+struct IDBGetRecordData;
struct IDBKeyRangeData;
namespace IDBServer {
@@ -72,7 +73,7 @@
void createIndex(const IDBRequestData&, const IDBIndexInfo&);
void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
void putOrAdd(const IDBRequestData&, const IDBKeyData&, const IDBValue&, IndexedDB::ObjectStoreOverwriteMode);
- void getRecord(const IDBRequestData&, const IDBKeyRangeData&);
+ void getRecord(const IDBRequestData&, const IDBGetRecordData&);
void getCount(const IDBRequestData&, const IDBKeyRangeData&);
void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&);
void openCursor(const IDBRequestData&, const IDBCursorInfo&);
Added: trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetRecordData.cpp (0 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetRecordData.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetRecordData.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 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 "IDBGetRecordData.h"
+
+#if ENABLE(INDEXED_DATABASE)
+
+#include "IDBKeyRangeData.h"
+
+namespace WebCore {
+
+IDBGetRecordData IDBGetRecordData::isolatedCopy() const
+{
+ return { keyRangeData.isolatedCopy() };
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INDEXED_DATABASE)
Added: trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetRecordData.h (0 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetRecordData.h (rev 0)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBGetRecordData.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#pragma once
+
+#if ENABLE(INDEXED_DATABASE)
+
+#include "IDBKeyRangeData.h"
+
+namespace WebCore {
+
+struct IDBGetRecordData {
+ IDBKeyRangeData keyRangeData;
+
+ IDBGetRecordData isolatedCopy() const;
+
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBGetRecordData&);
+};
+
+template<class Encoder>
+void IDBGetRecordData::encode(Encoder& encoder) const
+{
+ encoder << keyRangeData;
+}
+
+template<class Decoder>
+bool IDBGetRecordData::decode(Decoder& decoder, IDBGetRecordData& getRecordData)
+{
+ if (!decoder.decode(getRecordData.keyRangeData))
+ return false;
+
+ return true;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -32,6 +32,7 @@
#include "IDBConnectionToClient.h"
#include "IDBConnectionToServer.h"
#include "IDBCursorInfo.h"
+#include "IDBGetRecordData.h"
#include "IDBKeyRangeData.h"
#include "IDBOpenDBRequest.h"
#include "IDBRequestData.h"
@@ -271,10 +272,10 @@
});
}
-void InProcessIDBServer::getRecord(const IDBRequestData& requestData, const IDBKeyRangeData& keyRangeData)
+void InProcessIDBServer::getRecord(const IDBRequestData& requestData, const IDBGetRecordData& getRecordData)
{
- RunLoop::current().dispatch([this, protectedThis = makeRef(*this), requestData, keyRangeData] {
- m_server->getRecord(requestData, keyRangeData);
+ RunLoop::current().dispatch([this, protectedThis = makeRef(*this), requestData, getRecordData] {
+ m_server->getRecord(requestData, getRecordData);
});
}
Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h (204017 => 204018)
--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -68,7 +68,7 @@
void createIndex(const IDBRequestData&, const IDBIndexInfo&) final;
void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) final;
void putOrAdd(const IDBRequestData&, const IDBKeyData&, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode) final;
- void getRecord(const IDBRequestData&, const IDBKeyRangeData&) final;
+ void getRecord(const IDBRequestData&, const IDBGetRecordData&) final;
void getCount(const IDBRequestData&, const IDBKeyRangeData&) final;
void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&) final;
void openCursor(const IDBRequestData&, const IDBCursorInfo&) final;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204017 => 204018)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-02 07:19:58 UTC (rev 204018)
@@ -2081,6 +2081,8 @@
510192D218B6B9AB007FC7A1 /* ImageControlsRootElementMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 510192D018B6B9AB007FC7A1 /* ImageControlsRootElementMac.h */; };
510192D518B6B9B7007FC7A1 /* ImageControlsRootElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510192D318B6B9B7007FC7A1 /* ImageControlsRootElement.cpp */; };
510192D618B6B9B7007FC7A1 /* ImageControlsRootElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 510192D418B6B9B7007FC7A1 /* ImageControlsRootElement.h */; };
+ 5105F0691D4BA9D900FB80BC /* IDBGetRecordData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5105F0681D4BA54100FB80BC /* IDBGetRecordData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 5105F06B1D4BB12700FB80BC /* IDBGetRecordData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105F06A1D4BB0BC00FB80BC /* IDBGetRecordData.cpp */; };
5106D7BD18BDB76F000AB166 /* ContextMenuContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5106D7BB18BDB76F000AB166 /* ContextMenuContext.cpp */; };
5106D7BE18BDB76F000AB166 /* ContextMenuContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 5106D7BC18BDB76F000AB166 /* ContextMenuContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
510A58E41BAA40B100C19282 /* InProcessIDBServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510A58E21BAA40AE00C19282 /* InProcessIDBServer.cpp */; };
@@ -9513,6 +9515,8 @@
510192D818B7D7AB007FC7A1 /* imageControlsMac.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = imageControlsMac.css; sourceTree = "<group>"; };
5103105E1BA8E090003329C0 /* IDBDatabaseIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBDatabaseIdentifier.cpp; sourceTree = "<group>"; };
5103105F1BA8E090003329C0 /* IDBDatabaseIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseIdentifier.h; sourceTree = "<group>"; };
+ 5105F0681D4BA54100FB80BC /* IDBGetRecordData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBGetRecordData.h; sourceTree = "<group>"; };
+ 5105F06A1D4BB0BC00FB80BC /* IDBGetRecordData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBGetRecordData.cpp; sourceTree = "<group>"; };
5106D7BB18BDB76F000AB166 /* ContextMenuContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenuContext.cpp; sourceTree = "<group>"; };
5106D7BC18BDB76F000AB166 /* ContextMenuContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuContext.h; sourceTree = "<group>"; };
510A58E21BAA40AE00C19282 /* InProcessIDBServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InProcessIDBServer.cpp; sourceTree = "<group>"; };
@@ -17566,6 +17570,8 @@
5148453D1BB9D076006A72ED /* IDBError.h */,
51F798EB1BE880D3008AE491 /* IDBIndexInfo.cpp */,
51F798EC1BE880D3008AE491 /* IDBIndexInfo.h */,
+ 5105F0681D4BA54100FB80BC /* IDBGetRecordData.h */,
+ 5105F06A1D4BB0BC00FB80BC /* IDBGetRecordData.cpp */,
5160712C1BD8307200DBC4F2 /* IDBObjectStoreInfo.cpp */,
5160712D1BD8307200DBC4F2 /* IDBObjectStoreInfo.h */,
510A58F51BACC4A500C19282 /* IDBRequestData.cpp */,
@@ -26305,6 +26311,7 @@
A8EA7CB80A192B9C00A8EF5F /* HTMLHeadingElement.h in Headers */,
A8EA7CAF0A192B9C00A8EF5F /* HTMLHRElement.h in Headers */,
A871DE270A152AC800B12A68 /* HTMLHtmlElement.h in Headers */,
+ 5105F0691D4BA9D900FB80BC /* IDBGetRecordData.h in Headers */,
A871DE2A0A152AC800B12A68 /* HTMLIFrameElement.h in Headers */,
A8EA7D2D0A19385500A8EF5F /* HTMLImageElement.h in Headers */,
A8EA7D2B0A19385500A8EF5F /* HTMLImageLoader.h in Headers */,
@@ -30115,6 +30122,7 @@
A8EA79F80A1916DF00A8EF5F /* HTMLMenuElement.cpp in Sources */,
2BE8E2C912A58A0100FAD550 /* HTMLMetaCharsetParser.cpp in Sources */,
A871DC270A15205700B12A68 /* HTMLMetaElement.cpp in Sources */,
+ 5105F06B1D4BB12700FB80BC /* IDBGetRecordData.cpp in Sources */,
A454424A119B3661009BE912 /* HTMLMeterElement.cpp in Sources */,
A8CFF7A90A156978000A4234 /* HTMLModElement.cpp in Sources */,
A8DF3FD5097FA0FC0052981B /* HTMLNameCollection.cpp in Sources */,
Modified: trunk/Source/WebKit2/ChangeLog (204017 => 204018)
--- trunk/Source/WebKit2/ChangeLog 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-02 07:19:58 UTC (rev 204018)
@@ -1,3 +1,19 @@
+2016-08-02 Brady Eidson <[email protected]>
+
+ Refactor data passed along for a "GetRecord" request.
+ https://bugs.webkit.org/show_bug.cgi?id=160352
+
+ Reviewed by Tim Horton.
+
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+ (WebKit::WebIDBConnectionToClient::getRecord):
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
+
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
+ (WebKit::WebIDBConnectionToServer::getRecord):
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+
2016-08-01 Carlos Garcia Campos <[email protected]>
[GTK] Move the redirected XComposite window to the web process
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp (204017 => 204018)
--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -34,6 +34,7 @@
#include "WebIDBConnectionToServerMessages.h"
#include "WebIDBResult.h"
#include <WebCore/IDBError.h>
+#include <WebCore/IDBGetRecordData.h>
#include <WebCore/IDBResultData.h>
#include <WebCore/IDBValue.h>
#include <WebCore/ThreadSafeDataBuffer.h>
@@ -264,9 +265,9 @@
DatabaseProcess::singleton().idbServer().putOrAdd(request, key, value, mode);
}
-void WebIDBConnectionToClient::getRecord(const IDBRequestData& request, const IDBKeyRangeData& range)
+void WebIDBConnectionToClient::getRecord(const IDBRequestData& request, const IDBGetRecordData& getRecordData)
{
- DatabaseProcess::singleton().idbServer().getRecord(request, range);
+ DatabaseProcess::singleton().idbServer().getRecord(request, getRecordData);
}
void WebIDBConnectionToClient::getCount(const IDBRequestData& request, const IDBKeyRangeData& range)
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h (204017 => 204018)
--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -40,6 +40,7 @@
class IDBTransactionInfo;
class IDBValue;
class SerializedScriptValue;
+struct IDBGetRecordData;
struct IDBKeyRangeData;
struct SecurityOriginData;
}
@@ -95,7 +96,7 @@
void createIndex(const WebCore::IDBRequestData&, const WebCore::IDBIndexInfo&);
void deleteIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
void putOrAdd(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, const WebCore::IDBValue&, unsigned overwriteMode);
- void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
+ void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBGetRecordData&);
void getCount(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
void deleteRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
void openCursor(const WebCore::IDBRequestData&, const WebCore::IDBCursorInfo&);
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in (204017 => 204018)
--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-08-02 07:19:58 UTC (rev 204018)
@@ -34,7 +34,7 @@
CreateIndex(WebCore::IDBRequestData requestData, WebCore::IDBIndexInfo info);
DeleteIndex(WebCore::IDBRequestData requestData, uint64_t objectStoreIdentifier, String indexName);
PutOrAdd(WebCore::IDBRequestData requestData, WebCore::IDBKeyData key, WebCore::IDBValue value, unsigned overwriteMode);
- GetRecord(WebCore::IDBRequestData requestData, struct WebCore::IDBKeyRangeData range);
+ GetRecord(WebCore::IDBRequestData requestData, struct WebCore::IDBGetRecordData getRecordData);
GetCount(WebCore::IDBRequestData requestData, struct WebCore::IDBKeyRangeData range);
DeleteRecord(WebCore::IDBRequestData requestData, struct WebCore::IDBKeyRangeData range);
OpenCursor(WebCore::IDBRequestData requestData, WebCore::IDBCursorInfo info);
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp (204017 => 204018)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-08-02 07:19:58 UTC (rev 204018)
@@ -138,9 +138,9 @@
send(Messages::WebIDBConnectionToClient::PutOrAdd(requestData, keyData, value, static_cast<unsigned>(mode)));
}
-void WebIDBConnectionToServer::getRecord(const IDBRequestData& requestData, const IDBKeyRangeData& range)
+void WebIDBConnectionToServer::getRecord(const IDBRequestData& requestData, const IDBGetRecordData& getRecordData)
{
- send(Messages::WebIDBConnectionToClient::GetRecord(requestData, range));
+ send(Messages::WebIDBConnectionToClient::GetRecord(requestData, getRecordData));
}
void WebIDBConnectionToServer::getCount(const IDBRequestData& requestData, const IDBKeyRangeData& range)
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h (204017 => 204018)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-08-02 06:51:31 UTC (rev 204017)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-08-02 07:19:58 UTC (rev 204018)
@@ -57,7 +57,7 @@
void createIndex(const WebCore::IDBRequestData&, const WebCore::IDBIndexInfo&) final;
void deleteIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) final;
void putOrAdd(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, const WebCore::IDBValue&, const WebCore::IndexedDB::ObjectStoreOverwriteMode) final;
- void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) final;
+ void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBGetRecordData&) final;
void getCount(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) final;
void deleteRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) final;
void openCursor(const WebCore::IDBRequestData&, const WebCore::IDBCursorInfo&) final;
