diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/Databases/IndexedDB')
4 files changed, 543 insertions, 55 deletions
diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp new file mode 100644 index 000000000..e6c1aa2f1 --- /dev/null +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp @@ -0,0 +1,368 @@ +/* + * 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 "WebIDBConnectionToServer.h" + +#if ENABLE(INDEXED_DATABASE) + +#include "DataReference.h" +#include "DatabaseToWebProcessConnectionMessages.h" +#include "NetworkConnectionToWebProcessMessages.h" +#include "NetworkProcessConnection.h" +#include "WebCoreArgumentCoders.h" +#include "WebIDBConnectionToClientMessages.h" +#include "WebIDBResult.h" +#include "WebProcess.h" +#include "WebToDatabaseProcessConnection.h" +#include <WebCore/IDBConnectionToServer.h> +#include <WebCore/IDBCursorInfo.h> +#include <WebCore/IDBDatabaseException.h> +#include <WebCore/IDBError.h> +#include <WebCore/IDBIndexInfo.h> +#include <WebCore/IDBIterateCursorData.h> +#include <WebCore/IDBKeyRangeData.h> +#include <WebCore/IDBObjectStoreInfo.h> +#include <WebCore/IDBOpenDBRequest.h> +#include <WebCore/IDBRequestData.h> +#include <WebCore/IDBResourceIdentifier.h> +#include <WebCore/IDBResultData.h> +#include <WebCore/IDBTransactionInfo.h> +#include <WebCore/IDBValue.h> + +using namespace WebCore; + +namespace WebKit { + +Ref<WebIDBConnectionToServer> WebIDBConnectionToServer::create() +{ + return adoptRef(*new WebIDBConnectionToServer); +} + +WebIDBConnectionToServer::WebIDBConnectionToServer() +{ + relaxAdoptionRequirement(); + + m_isOpenInServer = sendSync(Messages::DatabaseToWebProcessConnection::EstablishIDBConnectionToServer(), Messages::DatabaseToWebProcessConnection::EstablishIDBConnectionToServer::Reply(m_identifier)); + m_connectionToServer = IDBClient::IDBConnectionToServer::create(*this); +} + +WebIDBConnectionToServer::~WebIDBConnectionToServer() +{ + if (m_isOpenInServer) + send(Messages::DatabaseToWebProcessConnection::RemoveIDBConnectionToServer(m_identifier)); +} + +IPC::Connection* WebIDBConnectionToServer::messageSenderConnection() +{ + return &WebProcess::singleton().webToDatabaseProcessConnection()->connection(); +} + +IDBClient::IDBConnectionToServer& WebIDBConnectionToServer::coreConnectionToServer() +{ + return *m_connectionToServer; +} + +void WebIDBConnectionToServer::deleteDatabase(const IDBRequestData& requestData) +{ + send(Messages::WebIDBConnectionToClient::DeleteDatabase(requestData)); +} + +void WebIDBConnectionToServer::openDatabase(const IDBRequestData& requestData) +{ + send(Messages::WebIDBConnectionToClient::OpenDatabase(requestData)); +} + +void WebIDBConnectionToServer::abortTransaction(const IDBResourceIdentifier& transactionIdentifier) +{ + send(Messages::WebIDBConnectionToClient::AbortTransaction(transactionIdentifier)); +} + +void WebIDBConnectionToServer::commitTransaction(const IDBResourceIdentifier& transactionIdentifier) +{ + send(Messages::WebIDBConnectionToClient::CommitTransaction(transactionIdentifier)); +} + +void WebIDBConnectionToServer::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) +{ + send(Messages::WebIDBConnectionToClient::DidFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier)); +} + +void WebIDBConnectionToServer::createObjectStore(const IDBRequestData& requestData, const IDBObjectStoreInfo& info) +{ + send(Messages::WebIDBConnectionToClient::CreateObjectStore(requestData, info)); +} + +void WebIDBConnectionToServer::deleteObjectStore(const IDBRequestData& requestData, const String& objectStoreName) +{ + send(Messages::WebIDBConnectionToClient::DeleteObjectStore(requestData, objectStoreName)); +} + +void WebIDBConnectionToServer::renameObjectStore(const IDBRequestData& requestData, uint64_t objectStoreIdentifier, const String& newName) +{ + send(Messages::WebIDBConnectionToClient::RenameObjectStore(requestData, objectStoreIdentifier, newName)); +} + +void WebIDBConnectionToServer::clearObjectStore(const IDBRequestData& requestData, uint64_t objectStoreIdentifier) +{ + send(Messages::WebIDBConnectionToClient::ClearObjectStore(requestData, objectStoreIdentifier)); +} + +void WebIDBConnectionToServer::createIndex(const IDBRequestData& requestData, const IDBIndexInfo& info) +{ + send(Messages::WebIDBConnectionToClient::CreateIndex(requestData, info)); +} + +void WebIDBConnectionToServer::deleteIndex(const IDBRequestData& requestData, uint64_t objectStoreIdentifier, const String& indexName) +{ + send(Messages::WebIDBConnectionToClient::DeleteIndex(requestData, objectStoreIdentifier, indexName)); +} + +void WebIDBConnectionToServer::renameIndex(const IDBRequestData& requestData, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const String& newName) +{ + send(Messages::WebIDBConnectionToClient::RenameIndex(requestData, objectStoreIdentifier, indexIdentifier, newName)); +} + +void WebIDBConnectionToServer::putOrAdd(const IDBRequestData& requestData, const IDBKeyData& keyData, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode mode) +{ + send(Messages::WebIDBConnectionToClient::PutOrAdd(requestData, keyData, value, static_cast<unsigned>(mode))); +} + +void WebIDBConnectionToServer::getRecord(const IDBRequestData& requestData, const IDBGetRecordData& getRecordData) +{ + send(Messages::WebIDBConnectionToClient::GetRecord(requestData, getRecordData)); +} + +void WebIDBConnectionToServer::getAllRecords(const IDBRequestData& requestData, const IDBGetAllRecordsData& getAllRecordsData) +{ + send(Messages::WebIDBConnectionToClient::GetAllRecords(requestData, getAllRecordsData)); +} + +void WebIDBConnectionToServer::getCount(const IDBRequestData& requestData, const IDBKeyRangeData& range) +{ + send(Messages::WebIDBConnectionToClient::GetCount(requestData, range)); +} + +void WebIDBConnectionToServer::deleteRecord(const IDBRequestData& requestData, const IDBKeyRangeData& range) +{ + send(Messages::WebIDBConnectionToClient::DeleteRecord(requestData, range)); +} + +void WebIDBConnectionToServer::openCursor(const IDBRequestData& requestData, const IDBCursorInfo& info) +{ + send(Messages::WebIDBConnectionToClient::OpenCursor(requestData, info)); +} + +void WebIDBConnectionToServer::iterateCursor(const IDBRequestData& requestData, const IDBIterateCursorData& data) +{ + send(Messages::WebIDBConnectionToClient::IterateCursor(requestData, data)); +} + +void WebIDBConnectionToServer::establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo& info) +{ + send(Messages::WebIDBConnectionToClient::EstablishTransaction(databaseConnectionIdentifier, info)); +} + +void WebIDBConnectionToServer::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier) +{ + send(Messages::WebIDBConnectionToClient::DatabaseConnectionPendingClose(databaseConnectionIdentifier)); +} + +void WebIDBConnectionToServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier) +{ + send(Messages::WebIDBConnectionToClient::DatabaseConnectionClosed(databaseConnectionIdentifier)); +} + +void WebIDBConnectionToServer::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) +{ + send(Messages::WebIDBConnectionToClient::AbortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier)); +} + +void WebIDBConnectionToServer::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier) +{ + send(Messages::WebIDBConnectionToClient::DidFireVersionChangeEvent(databaseConnectionIdentifier, requestIdentifier)); +} + +void WebIDBConnectionToServer::openDBRequestCancelled(const IDBRequestData& requestData) +{ + send(Messages::WebIDBConnectionToClient::OpenDBRequestCancelled(requestData)); +} + +void WebIDBConnectionToServer::confirmDidCloseFromServer(uint64_t databaseConnectionIdentifier) +{ + send(Messages::WebIDBConnectionToClient::ConfirmDidCloseFromServer(databaseConnectionIdentifier)); +} + +void WebIDBConnectionToServer::getAllDatabaseNames(const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID) +{ + send(Messages::WebIDBConnectionToClient::GetAllDatabaseNames(m_identifier, topOrigin, openingOrigin, callbackID)); +} + +void WebIDBConnectionToServer::didDeleteDatabase(const IDBResultData& result) +{ + m_connectionToServer->didDeleteDatabase(result); +} + +void WebIDBConnectionToServer::didOpenDatabase(const IDBResultData& result) +{ + m_connectionToServer->didOpenDatabase(result); +} + +void WebIDBConnectionToServer::didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error) +{ + m_connectionToServer->didAbortTransaction(transactionIdentifier, error); +} + +void WebIDBConnectionToServer::didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error) +{ + m_connectionToServer->didCommitTransaction(transactionIdentifier, error); +} + +void WebIDBConnectionToServer::didCreateObjectStore(const IDBResultData& result) +{ + m_connectionToServer->didCreateObjectStore(result); +} + +void WebIDBConnectionToServer::didDeleteObjectStore(const IDBResultData& result) +{ + m_connectionToServer->didDeleteObjectStore(result); +} + +void WebIDBConnectionToServer::didRenameObjectStore(const IDBResultData& result) +{ + m_connectionToServer->didRenameObjectStore(result); +} + +void WebIDBConnectionToServer::didClearObjectStore(const IDBResultData& result) +{ + m_connectionToServer->didClearObjectStore(result); +} + +void WebIDBConnectionToServer::didCreateIndex(const IDBResultData& result) +{ + m_connectionToServer->didCreateIndex(result); +} + +void WebIDBConnectionToServer::didDeleteIndex(const IDBResultData& result) +{ + m_connectionToServer->didDeleteIndex(result); +} + +void WebIDBConnectionToServer::didRenameIndex(const IDBResultData& result) +{ + m_connectionToServer->didRenameIndex(result); +} + +void WebIDBConnectionToServer::didPutOrAdd(const IDBResultData& result) +{ + m_connectionToServer->didPutOrAdd(result); +} + +static void preregisterSandboxExtensionsIfNecessary(const WebIDBResult& result) +{ + auto resultType = result.resultData().type(); + if (resultType != IDBResultType::GetRecordSuccess && resultType != IDBResultType::OpenCursorSuccess && resultType != IDBResultType::IterateCursorSuccess && resultType != IDBResultType::GetAllRecordsSuccess) { + ASSERT(resultType == IDBResultType::Error); + return; + } + + const auto filePaths = resultType == IDBResultType::GetAllRecordsSuccess ? result.resultData().getAllResult().allBlobFilePaths() : result.resultData().getResult().value().blobFilePaths(); + +#if ENABLE(SANDBOX_EXTENSIONS) + ASSERT(filePaths.size() == result.handles().size()); +#endif + + if (!filePaths.isEmpty()) + WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::PreregisterSandboxExtensionsForOptionallyFileBackedBlob(filePaths, result.handles()), 0); +} + +void WebIDBConnectionToServer::didGetRecord(const WebIDBResult& result) +{ + preregisterSandboxExtensionsIfNecessary(result); + m_connectionToServer->didGetRecord(result.resultData()); +} + +void WebIDBConnectionToServer::didGetAllRecords(const WebIDBResult& result) +{ + if (result.resultData().getAllResult().type() == IndexedDB::GetAllType::Values) + preregisterSandboxExtensionsIfNecessary(result); + m_connectionToServer->didGetAllRecords(result.resultData()); +} + +void WebIDBConnectionToServer::didGetCount(const IDBResultData& result) +{ + m_connectionToServer->didGetCount(result); +} + +void WebIDBConnectionToServer::didDeleteRecord(const IDBResultData& result) +{ + m_connectionToServer->didDeleteRecord(result); +} + +void WebIDBConnectionToServer::didOpenCursor(const WebIDBResult& result) +{ + preregisterSandboxExtensionsIfNecessary(result); + m_connectionToServer->didOpenCursor(result.resultData()); +} + +void WebIDBConnectionToServer::didIterateCursor(const WebIDBResult& result) +{ + preregisterSandboxExtensionsIfNecessary(result); + m_connectionToServer->didIterateCursor(result.resultData()); +} + +void WebIDBConnectionToServer::fireVersionChangeEvent(uint64_t uniqueDatabaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion) +{ + m_connectionToServer->fireVersionChangeEvent(uniqueDatabaseConnectionIdentifier, requestIdentifier, requestedVersion); +} + +void WebIDBConnectionToServer::didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError& error) +{ + m_connectionToServer->didStartTransaction(transactionIdentifier, error); +} + +void WebIDBConnectionToServer::didCloseFromServer(uint64_t databaseConnectionIdentifier, const IDBError& error) +{ + m_connectionToServer->didCloseFromServer(databaseConnectionIdentifier, error); +} + +void WebIDBConnectionToServer::notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion) +{ + m_connectionToServer->notifyOpenDBRequestBlocked(requestIdentifier, oldVersion, newVersion); +} + +void WebIDBConnectionToServer::didGetAllDatabaseNames(uint64_t callbackID, const Vector<String>& databaseNames) +{ + m_connectionToServer->didGetAllDatabaseNames(callbackID, databaseNames); +} + +void WebIDBConnectionToServer::connectionToServerLost() +{ + m_connectionToServer->connectionToServerLost({ WebCore::IDBDatabaseException::UnknownError, ASCIILiteral("An internal error was encountered in the Indexed Database server") }); +} + +} // namespace WebKit + +#endif // ENABLE(INDEXED_DATABASE) diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h new file mode 100644 index 000000000..c5ed93f38 --- /dev/null +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h @@ -0,0 +1,122 @@ +/* + * 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 "MessageSender.h" +#include "SandboxExtension.h" +#include <WebCore/IDBConnectionToServer.h> + +namespace WebKit { + +class WebIDBResult; + +class WebIDBConnectionToServer final : public WebCore::IDBClient::IDBConnectionToServerDelegate, public IPC::MessageSender, public RefCounted<WebIDBConnectionToServer> { +public: + static Ref<WebIDBConnectionToServer> create(); + + virtual ~WebIDBConnectionToServer(); + + WebCore::IDBClient::IDBConnectionToServer& coreConnectionToServer(); + uint64_t identifier() const final { return m_identifier; } + uint64_t messageSenderDestinationID() final { return m_identifier; } + + // IDBConnectionToServerDelegate + void deleteDatabase(const WebCore::IDBRequestData&) final; + void openDatabase(const WebCore::IDBRequestData&) final; + void abortTransaction(const WebCore::IDBResourceIdentifier&) final; + void commitTransaction(const WebCore::IDBResourceIdentifier&) final; + void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier&) final; + void createObjectStore(const WebCore::IDBRequestData&, const WebCore::IDBObjectStoreInfo&) final; + void deleteObjectStore(const WebCore::IDBRequestData&, const String& objectStoreName) final; + void renameObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& newName) final; + void clearObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier) final; + void createIndex(const WebCore::IDBRequestData&, const WebCore::IDBIndexInfo&) final; + void deleteIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) final; + void renameIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const String& newName) final; + void putOrAdd(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, const WebCore::IDBValue&, const WebCore::IndexedDB::ObjectStoreOverwriteMode) final; + void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBGetRecordData&) final; + void getAllRecords(const WebCore::IDBRequestData&, const WebCore::IDBGetAllRecordsData&) 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; + void iterateCursor(const WebCore::IDBRequestData&, const WebCore::IDBIterateCursorData&) final; + void establishTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBTransactionInfo&) final; + void databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier) final; + void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) final; + void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& transactionIdentifier) final; + void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier) final; + void openDBRequestCancelled(const WebCore::IDBRequestData&) final; + void confirmDidCloseFromServer(uint64_t databaseConnectionIdentifier) final; + + void getAllDatabaseNames(const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID) final; + + void ref() override { RefCounted<WebIDBConnectionToServer>::ref(); } + void deref() override { RefCounted<WebIDBConnectionToServer>::deref(); } + + // Messages received from DatabaseProcess + void didDeleteDatabase(const WebCore::IDBResultData&); + void didOpenDatabase(const WebCore::IDBResultData&); + void didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&); + void didCommitTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&); + void didCreateObjectStore(const WebCore::IDBResultData&); + void didDeleteObjectStore(const WebCore::IDBResultData&); + void didRenameObjectStore(const WebCore::IDBResultData&); + void didClearObjectStore(const WebCore::IDBResultData&); + void didCreateIndex(const WebCore::IDBResultData&); + void didDeleteIndex(const WebCore::IDBResultData&); + void didRenameIndex(const WebCore::IDBResultData&); + void didPutOrAdd(const WebCore::IDBResultData&); + void didGetRecord(const WebIDBResult&); + void didGetAllRecords(const WebIDBResult&); + void didGetCount(const WebCore::IDBResultData&); + void didDeleteRecord(const WebCore::IDBResultData&); + void didOpenCursor(const WebIDBResult&); + void didIterateCursor(const WebIDBResult&); + void fireVersionChangeEvent(uint64_t uniqueDatabaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion); + void didStartTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&); + void didCloseFromServer(uint64_t databaseConnectionIdentifier, const WebCore::IDBError&); + void notifyOpenDBRequestBlocked(const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion); + void didGetAllDatabaseNames(uint64_t callbackID, const Vector<String>& databaseNames); + + void didReceiveMessage(IPC::Connection&, IPC::Decoder&); + + void connectionToServerLost(); + +private: + WebIDBConnectionToServer(); + + IPC::Connection* messageSenderConnection() final; + + uint64_t m_identifier; + bool m_isOpenInServer { false }; + RefPtr<WebCore::IDBClient::IDBConnectionToServer> m_connectionToServer; +}; + +} // namespace WebKit + +#endif // ENABLE(INDEXED_DATABASE) diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in new file mode 100644 index 000000000..b701074de --- /dev/null +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in @@ -0,0 +1,53 @@ +# 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. + +#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS) + +messages -> WebIDBConnectionToServer { + DidDeleteDatabase(WebCore::IDBResultData result) + DidOpenDatabase(WebCore::IDBResultData result) + DidAbortTransaction(WebCore::IDBResourceIdentifier transactionIdentifier, WebCore::IDBError error) + DidCommitTransaction(WebCore::IDBResourceIdentifier transactionIdentifier, WebCore::IDBError error) + DidCreateObjectStore(WebCore::IDBResultData result) + DidDeleteObjectStore(WebCore::IDBResultData result) + DidRenameObjectStore(WebCore::IDBResultData result) + DidClearObjectStore(WebCore::IDBResultData result) + DidCreateIndex(WebCore::IDBResultData result) + DidDeleteIndex(WebCore::IDBResultData result) + DidRenameIndex(WebCore::IDBResultData result) + DidPutOrAdd(WebCore::IDBResultData result) + DidGetRecord(WebKit::WebIDBResult result) + DidGetAllRecords(WebKit::WebIDBResult result) + DidGetCount(WebCore::IDBResultData result) + DidDeleteRecord(WebCore::IDBResultData result) + DidOpenCursor(WebKit::WebIDBResult result) + DidIterateCursor(WebKit::WebIDBResult result) + + FireVersionChangeEvent(uint64_t databaseConnectionIdentifier, WebCore::IDBResourceIdentifier requestIdentifier, uint64_t requestedVersion) + DidStartTransaction(WebCore::IDBResourceIdentifier transactionIdentifier, WebCore::IDBError error) + DidCloseFromServer(uint64_t databaseConnectionIdentifier, WebCore::IDBError error) final; + NotifyOpenDBRequestBlocked(WebCore::IDBResourceIdentifier requestIdentifier, uint64_t oldVersion, uint64_t newVersion) + + DidGetAllDatabaseNames(uint64_t callbackID, Vector<String> databaseNames) +} + +#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS) diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h deleted file mode 100644 index 4a111944e..000000000 --- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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. ``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 COMPUTER, INC. OR - * 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 WebIDBFactoryBackend_h -#define WebIDBFactoryBackend_h - -#include <WebCore/IDBFactoryBackendInterface.h> - -#if ENABLE(INDEXED_DATABASE) - -namespace WebKit { - -class WebIDBFactoryBackend final : public WebCore::IDBFactoryBackendInterface { -public: - static PassRefPtr<WebIDBFactoryBackend> create(const String& databaseDirectoryIdentifier) { return adoptRef(new WebIDBFactoryBackend(databaseDirectoryIdentifier)); } - - virtual ~WebIDBFactoryBackend(); - - virtual void getDatabaseNames(PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::SecurityOrigin>, WebCore::ScriptExecutionContext*, const String& dataDir) override; - virtual void open(const String& name, uint64_t version, int64_t transactionId, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin) override; - virtual void deleteDatabase(const String& name, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::SecurityOrigin>, WebCore::ScriptExecutionContext*, const String& dataDir) override; - - virtual void removeIDBDatabaseBackend(const String& uniqueIdentifier) override; - -private: - explicit WebIDBFactoryBackend(const String& databaseDirectoryIdentifier); -}; - -} // namespace WebKit - -#endif // ENABLE(INDEXED_DATABASE) -#endif // WebIDBFactoryBackend_h |