Changeset 196705 in webkit


Ignore:
Timestamp:
Feb 17, 2016 11:21:59 AM (8 years ago)
Author:
beidson@apple.com
Message:

Modern IDB: More WK2 IPC Scaffolding.
​https://bugs.webkit.org/show_bug.cgi?id=154317

Reviewed by Alex Christensen.

No change in behavior yet; Just laying the groundwork.

Source/WebCore:

  • Modules/indexeddb/shared/IDBCursorInfo.cpp:

(WebCore::IDBCursorInfo::IDBCursorInfo):

  • Modules/indexeddb/shared/IDBCursorInfo.h:

(WebCore::IDBCursorInfo::decode):

  • Modules/indexeddb/shared/IDBError.h:

(WebCore::IDBError::decode):

  • Modules/indexeddb/shared/IDBIndexInfo.h:

(WebCore::IDBIndexInfo::decode):

  • Modules/indexeddb/shared/IDBObjectStoreInfo.h:

(WebCore::IDBObjectStoreInfo::decode):

  • Modules/indexeddb/shared/IDBRequestData.cpp:

(WebCore::IDBRequestData::IDBRequestData):

  • Modules/indexeddb/shared/IDBRequestData.h:

(WebCore::IDBRequestData::decode):

  • Modules/indexeddb/shared/IDBResourceIdentifier.cpp:

(WebCore::IDBResourceIdentifier::IDBResourceIdentifier):

  • Modules/indexeddb/shared/IDBResourceIdentifier.h:

(WebCore::IDBResourceIdentifier::decode):

  • Modules/indexeddb/shared/IDBResultData.cpp:

(WebCore::IDBResultData::IDBResultData):

  • Modules/indexeddb/shared/IDBResultData.h:

(WebCore::IDBResultData::decode):

  • Modules/indexeddb/shared/IDBTransactionInfo.cpp:

(WebCore::IDBTransactionInfo::IDBTransactionInfo):

  • Modules/indexeddb/shared/IDBTransactionInfo.h:

(WebCore::IDBTransactionInfo::decode):

  • WebCore.xcodeproj/project.pbxproj:

Source/WebKit2:

  • CMakeLists.txt:
  • DerivedSources.make:
  • WebKit2.xcodeproj/project.pbxproj:
  • DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:

(WebKit::WebIDBConnectionToClient::deleteDatabase):
(WebKit::WebIDBConnectionToClient::openDatabase):
(WebKit::WebIDBConnectionToClient::abortTransaction):
(WebKit::WebIDBConnectionToClient::commitTransaction):
(WebKit::WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction):
(WebKit::WebIDBConnectionToClient::createObjectStore):
(WebKit::WebIDBConnectionToClient::deleteObjectStore):
(WebKit::WebIDBConnectionToClient::clearObjectStore):
(WebKit::WebIDBConnectionToClient::createIndex):
(WebKit::WebIDBConnectionToClient::deleteIndex):
(WebKit::WebIDBConnectionToClient::putOrAdd):
(WebKit::WebIDBConnectionToClient::getRecord):
(WebKit::WebIDBConnectionToClient::getCount):
(WebKit::WebIDBConnectionToClient::deleteRecord):
(WebKit::WebIDBConnectionToClient::openCursor):
(WebKit::WebIDBConnectionToClient::iterateCursor):
(WebKit::WebIDBConnectionToClient::establishTransaction):
(WebKit::WebIDBConnectionToClient::databaseConnectionClosed):
(WebKit::WebIDBConnectionToClient::abortOpenAndUpgradeNeeded):
(WebKit::WebIDBConnectionToClient::didFireVersionChangeEvent):

  • DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
  • DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in: Added.
  • WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:

(WebKit::WebIDBConnectionToServer::didDeleteDatabase):
(WebKit::WebIDBConnectionToServer::didOpenDatabase):
(WebKit::WebIDBConnectionToServer::didAbortTransaction):
(WebKit::WebIDBConnectionToServer::didCommitTransaction):
(WebKit::WebIDBConnectionToServer::didCreateObjectStore):
(WebKit::WebIDBConnectionToServer::didDeleteObjectStore):
(WebKit::WebIDBConnectionToServer::didClearObjectStore):
(WebKit::WebIDBConnectionToServer::didCreateIndex):
(WebKit::WebIDBConnectionToServer::didDeleteIndex):
(WebKit::WebIDBConnectionToServer::didPutOrAdd):
(WebKit::WebIDBConnectionToServer::didGetRecord):
(WebKit::WebIDBConnectionToServer::didGetCount):
(WebKit::WebIDBConnectionToServer::didDeleteRecord):
(WebKit::WebIDBConnectionToServer::didOpenCursor):
(WebKit::WebIDBConnectionToServer::didIterateCursor):

  • WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
  • WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in: Added.
Location:
trunk/Source
Files:
2 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r196703 r196705  
     12016-02-17  Brady Eidson  <beidson@apple.com>
     2
     3        Modern IDB: More WK2 IPC Scaffolding.
     4        https://bugs.webkit.org/show_bug.cgi?id=154317
     5
     6        Reviewed by Alex Christensen.
     7
     8        No change in behavior yet; Just laying the groundwork.
     9
     10        * Modules/indexeddb/shared/IDBCursorInfo.cpp:
     11        (WebCore::IDBCursorInfo::IDBCursorInfo):
     12        * Modules/indexeddb/shared/IDBCursorInfo.h:
     13        (WebCore::IDBCursorInfo::decode):
     14        * Modules/indexeddb/shared/IDBError.h:
     15        (WebCore::IDBError::decode):
     16        * Modules/indexeddb/shared/IDBIndexInfo.h:
     17        (WebCore::IDBIndexInfo::decode):
     18        * Modules/indexeddb/shared/IDBObjectStoreInfo.h:
     19        (WebCore::IDBObjectStoreInfo::decode):
     20        * Modules/indexeddb/shared/IDBRequestData.cpp:
     21        (WebCore::IDBRequestData::IDBRequestData):
     22        * Modules/indexeddb/shared/IDBRequestData.h:
     23        (WebCore::IDBRequestData::decode):
     24        * Modules/indexeddb/shared/IDBResourceIdentifier.cpp:
     25        (WebCore::IDBResourceIdentifier::IDBResourceIdentifier):
     26        * Modules/indexeddb/shared/IDBResourceIdentifier.h:
     27        (WebCore::IDBResourceIdentifier::decode):
     28        * Modules/indexeddb/shared/IDBResultData.cpp:
     29        (WebCore::IDBResultData::IDBResultData):
     30        * Modules/indexeddb/shared/IDBResultData.h:
     31        (WebCore::IDBResultData::decode):
     32        * Modules/indexeddb/shared/IDBTransactionInfo.cpp:
     33        (WebCore::IDBTransactionInfo::IDBTransactionInfo):
     34        * Modules/indexeddb/shared/IDBTransactionInfo.h:
     35        (WebCore::IDBTransactionInfo::decode):
     36        * WebCore.xcodeproj/project.pbxproj:
     37
    1382016-02-17  Eric Carlson  <eric.carlson@apple.com>
    239

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBCursorInfo.cpp

    r192847 r196705  
    4242{
    4343    return { transaction, objectStoreIdentifier, indexIdentifier, range, direction, type };
     44}
     45
     46IDBCursorInfo::IDBCursorInfo()
     47{
    4448}
    4549

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBCursorInfo.h

    r192847 r196705  
    7070    IDBCursorInfo isolatedCopy() const;
    7171
     72    WEBCORE_EXPORT IDBCursorInfo();
     73    template<class Encoder> void encode(Encoder&) const;
     74    template<class Decoder> static bool decode(Decoder&, IDBCursorInfo&);
     75
    7276private:
    7377    IDBCursorInfo(IDBClient::IDBTransaction&, uint64_t objectStoreIdentifier, const IDBKeyRangeData&, IndexedDB::CursorDirection, IndexedDB::CursorType);
    … …  
    8892};
    8993
     94template<class Decoder> bool IDBCursorInfo::decode(Decoder&, IDBCursorInfo&)
     95{
     96    return false;
     97}
     98
    9099} // namespace WebCore
    91100

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBError.h

    r192948 r196705  
    5050    IDBError isolatedCopy() const;
    5151
     52    template<class Encoder> void encode(Encoder&) const;
     53    template<class Decoder> static bool decode(Decoder&, IDBError&);
     54
    5255private:
    5356    ExceptionCode m_code { IDBDatabaseException::NoError };
    … …  
    5558};
    5659
     60template<class Decoder> bool IDBError::decode(Decoder&, IDBError&)
     61{
     62    return false;
     63}
     64
    5765} // namespace WebCore
    5866

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h

    r192645 r196705  
    4848    bool multiEntry() const { return m_multiEntry; }
    4949
     50    template<class Encoder> void encode(Encoder&) const;
     51    template<class Decoder> static bool decode(Decoder&, IDBIndexInfo&);
     52
    5053#ifndef NDEBUG
    5154    String loggingString(int indent = 0) const;
    … …  
    6164};
    6265
     66template<class Decoder> bool IDBIndexInfo::decode(Decoder&, IDBIndexInfo&)
     67{
     68    return false;
     69}
     70
    6371} // namespace WebCore
    6472

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h

    r195689 r196705  
    6363    void deleteIndex(uint64_t indexIdentifier);
    6464
     65    template<class Encoder> void encode(Encoder&) const;
     66    template<class Decoder> static bool decode(Decoder&, IDBObjectStoreInfo&);
     67
    6568#ifndef NDEBUG
    6669    String loggingString(int indent = 0) const;
    … …  
    7881};
    7982
     83template<class Decoder> bool IDBObjectStoreInfo::decode(Decoder&, IDBObjectStoreInfo&)
     84{
     85    return false;
     86}
     87
    8088} // namespace WebCore
    8189

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp

    r194169 r196705  
    3333
    3434namespace WebCore {
     35
     36IDBRequestData::IDBRequestData()
     37{
     38}
    3539
    3640IDBRequestData::IDBRequestData(const IDBClient::IDBConnectionToServer& connection, const IDBClient::IDBOpenDBRequest& request)

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h

    r194169 r196705  
    6868    IDBRequestData isolatedCopy();
    6969
     70    WEBCORE_EXPORT IDBRequestData();
     71
     72    template<class Encoder> void encode(Encoder&) const;
     73    template<class Decoder> static bool decode(Decoder&, IDBRequestData&);
     74
    7075private:
    7176    uint64_t m_serverConnectionIdentifier { 0 };
    … …  
    8388};
    8489
     90template<class Decoder> bool IDBRequestData::decode(Decoder&, IDBRequestData&)
     91{
     92    return false;
     93}
     94
    8595} // namespace WebCore
    8696

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.cpp

    r192749 r196705  
    4848    static uint64_t currentNumber = 0;
    4949    return currentNumber += 2;
     50}
     51
     52IDBResourceIdentifier::IDBResourceIdentifier()
     53{
    5054}
    5155

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBResourceIdentifier.h

    r196651 r196705  
    7777#endif
    7878
     79    WEBCORE_EXPORT IDBResourceIdentifier();
     80
     81    template<class Encoder> void encode(Encoder&) const;
     82    template<class Decoder> static bool decode(Decoder&, IDBResourceIdentifier&);
     83
    7984private:
    80     IDBResourceIdentifier() = delete;
    8185    IDBResourceIdentifier(uint64_t connectionIdentifier, uint64_t resourceIdentifier);
    8286    uint64_t m_idbConnectionIdentifier { 0 };
    … …  
    115119};
    116120
     121template<class Decoder> bool IDBResourceIdentifier::decode(Decoder&, IDBResourceIdentifier&)
     122{
     123    return false;
     124}
     125
    117126} // namespace WebCore
    118127

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp

    r194428 r196705  
    3434
    3535namespace WebCore {
     36
     37IDBResultData::IDBResultData()
     38{
     39}
    3640
    3741IDBResultData::IDBResultData(const IDBResourceIdentifier& requestIdentifier)

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h

    r192687 r196705  
    9999    const IDBGetResult& getResult() const;
    100100
     101    WEBCORE_EXPORT IDBResultData();
     102    template<class Encoder> void encode(Encoder&) const;
     103    template<class Decoder> static bool decode(Decoder&, IDBResultData&);
     104
    101105private:
    102106    IDBResultData(const IDBResourceIdentifier&);
    103107    IDBResultData(IDBResultType, const IDBResourceIdentifier&);
    104108
    105     IDBResultType m_type;
     109    IDBResultType m_type { IDBResultType::Error };
    106110    IDBResourceIdentifier m_requestIdentifier;
    107111
    … …  
    115119};
    116120
     121template<class Decoder> bool IDBResultData::decode(Decoder&, IDBResultData&)
     122{
     123    return false;
     124}
     125
    117126} // namespace WebCore
    118127

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp

    r194428 r196705  
    3232
    3333namespace WebCore {
     34
     35IDBTransactionInfo::IDBTransactionInfo()
     36{
     37}
    3438
    3539IDBTransactionInfo::IDBTransactionInfo(const IDBResourceIdentifier& identifier)

  • trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h

    r195467 r196705  
    6262    IDBDatabaseInfo* originalDatabaseInfo() const { return m_originalDatabaseInfo.get(); }
    6363
     64    WEBCORE_EXPORT IDBTransactionInfo();
     65    template<class Encoder> void encode(Encoder&) const;
     66    template<class Decoder> static bool decode(Decoder&, IDBTransactionInfo&);
     67
    6468#ifndef NDEBUG
    6569    String loggingString() const;
    … …  
    7781};
    7882
     83template<class Decoder> bool IDBTransactionInfo::decode(Decoder&, IDBTransactionInfo&)
     84{
     85    return false;
     86}
     87
    7988} // namespace WebCore
    8089

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r196688 r196705  
    20652065                517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 517138F61BF12262000D5F01 /* IndexValueStore.h */; };
    20662066                517138FB1BF3ADF4000D5F01 /* IDBCursorInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517138F91BF3ADAC000D5F01 /* IDBCursorInfo.cpp */; };
    2067                 517138FC1BF3ADF4000D5F01 /* IDBCursorInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 517138FA1BF3ADAC000D5F01 /* IDBCursorInfo.h */; };
     2067                517138FC1BF3ADF4000D5F01 /* IDBCursorInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 517138FA1BF3ADAC000D5F01 /* IDBCursorInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
    20682068                517139051BF64DEC000D5F01 /* MemoryObjectStoreCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517139031BF64DE3000D5F01 /* MemoryObjectStoreCursor.cpp */; };
    20692069                517139061BF64DEC000D5F01 /* MemoryObjectStoreCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 517139041BF64DE3000D5F01 /* MemoryObjectStoreCursor.h */; };
    … …  
    22052205                51D0C5160DAA90B7003B3831 /* JSStorageCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C5150DAA90B7003B3831 /* JSStorageCustom.cpp */; };
    22062206                51D7236C1BB6174900478CA3 /* IDBResultData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D7236A1BB60BFE00478CA3 /* IDBResultData.cpp */; };
    2207                 51D7236D1BB6174900478CA3 /* IDBResultData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D7236B1BB60BFE00478CA3 /* IDBResultData.h */; };
     2207                51D7236D1BB6174900478CA3 /* IDBResultData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D7236B1BB60BFE00478CA3 /* IDBResultData.h */; settings = {ATTRIBUTES = (Private, ); }; };
    22082208                51D7EFEA1BDE8F8C00E93E10 /* ThreadSafeDataBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 511FAEA91BDC989A00B4AFE4 /* ThreadSafeDataBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
    22092209                51D7EFEC1BDEFA5100E93E10 /* TransactionOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D7EFEB1BDEFA4700E93E10 /* TransactionOperation.cpp */; };

  • trunk/Source/WebKit2/CMakeLists.txt

    r196700 r196705  
    644644
    645645    DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in
     646    DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in
    646647
    647648    NetworkProcess/CustomProtocols/CustomProtocolManager.messages.in
    … …  
    696697    WebProcess/Cookies/WebCookieManager.messages.in
    697698
     699    WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in
    698700    WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in
    699701

  • trunk/Source/WebKit2/ChangeLog

    r196701 r196705  
     12016-02-17  Brady Eidson  <beidson@apple.com>
     2
     3        Modern IDB: More WK2 IPC Scaffolding.
     4        https://bugs.webkit.org/show_bug.cgi?id=154317
     5
     6        Reviewed by Alex Christensen.
     7
     8        No change in behavior yet; Just laying the groundwork.
     9
     10        * CMakeLists.txt:
     11        * DerivedSources.make:
     12        * WebKit2.xcodeproj/project.pbxproj:
     13
     14        * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
     15        (WebKit::WebIDBConnectionToClient::deleteDatabase):
     16        (WebKit::WebIDBConnectionToClient::openDatabase):
     17        (WebKit::WebIDBConnectionToClient::abortTransaction):
     18        (WebKit::WebIDBConnectionToClient::commitTransaction):
     19        (WebKit::WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction):
     20        (WebKit::WebIDBConnectionToClient::createObjectStore):
     21        (WebKit::WebIDBConnectionToClient::deleteObjectStore):
     22        (WebKit::WebIDBConnectionToClient::clearObjectStore):
     23        (WebKit::WebIDBConnectionToClient::createIndex):
     24        (WebKit::WebIDBConnectionToClient::deleteIndex):
     25        (WebKit::WebIDBConnectionToClient::putOrAdd):
     26        (WebKit::WebIDBConnectionToClient::getRecord):
     27        (WebKit::WebIDBConnectionToClient::getCount):
     28        (WebKit::WebIDBConnectionToClient::deleteRecord):
     29        (WebKit::WebIDBConnectionToClient::openCursor):
     30        (WebKit::WebIDBConnectionToClient::iterateCursor):
     31        (WebKit::WebIDBConnectionToClient::establishTransaction):
     32        (WebKit::WebIDBConnectionToClient::databaseConnectionClosed):
     33        (WebKit::WebIDBConnectionToClient::abortOpenAndUpgradeNeeded):
     34        (WebKit::WebIDBConnectionToClient::didFireVersionChangeEvent):
     35        * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
     36        * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in: Added.
     37
     38        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
     39        (WebKit::WebIDBConnectionToServer::didDeleteDatabase):
     40        (WebKit::WebIDBConnectionToServer::didOpenDatabase):
     41        (WebKit::WebIDBConnectionToServer::didAbortTransaction):
     42        (WebKit::WebIDBConnectionToServer::didCommitTransaction):
     43        (WebKit::WebIDBConnectionToServer::didCreateObjectStore):
     44        (WebKit::WebIDBConnectionToServer::didDeleteObjectStore):
     45        (WebKit::WebIDBConnectionToServer::didClearObjectStore):
     46        (WebKit::WebIDBConnectionToServer::didCreateIndex):
     47        (WebKit::WebIDBConnectionToServer::didDeleteIndex):
     48        (WebKit::WebIDBConnectionToServer::didPutOrAdd):
     49        (WebKit::WebIDBConnectionToServer::didGetRecord):
     50        (WebKit::WebIDBConnectionToServer::didGetCount):
     51        (WebKit::WebIDBConnectionToServer::didDeleteRecord):
     52        (WebKit::WebIDBConnectionToServer::didOpenCursor):
     53        (WebKit::WebIDBConnectionToServer::didIterateCursor):
     54        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
     55        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in: Added.
     56
    1572016-02-17  Alex Christensen  <achristensen@webkit.org>
    258

  • trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp

    r196651 r196705  
    135135}
    136136
     137void WebIDBConnectionToClient::deleteDatabase(const IDBRequestData&)
     138{
     139}
     140
     141void WebIDBConnectionToClient::openDatabase(const IDBRequestData&)
     142{
     143}
     144
     145void WebIDBConnectionToClient::abortTransaction(const IDBResourceIdentifier&)
     146{
     147}
     148
     149void WebIDBConnectionToClient::commitTransaction(const IDBResourceIdentifier&)
     150{
     151}
     152
     153void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&)
     154{
     155}
     156
     157void WebIDBConnectionToClient::createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&)
     158{
     159}
     160
     161void WebIDBConnectionToClient::deleteObjectStore(const IDBRequestData&, const String&)
     162{
     163}
     164
     165void WebIDBConnectionToClient::clearObjectStore(const IDBRequestData&, uint64_t)
     166{
     167}
     168
     169void WebIDBConnectionToClient::createIndex(const IDBRequestData&, const IDBIndexInfo&)
     170{
     171}
     172
     173void WebIDBConnectionToClient::deleteIndex(const IDBRequestData&, uint64_t, const String&)
     174{
     175}
     176
     177void WebIDBConnectionToClient::putOrAdd(const IDBRequestData&, const IDBKeyData&, const IPC::DataReference&, bool)
     178{
     179}
     180
     181void WebIDBConnectionToClient::getRecord(const IDBRequestData&, const IDBKeyRangeData&)
     182{
     183}
     184
     185void WebIDBConnectionToClient::getCount(const IDBRequestData&, const IDBKeyRangeData&)
     186{
     187}
     188
     189void WebIDBConnectionToClient::deleteRecord(const IDBRequestData&, const IDBKeyRangeData&)
     190{
     191}
     192
     193void WebIDBConnectionToClient::openCursor(const IDBRequestData&, const IDBCursorInfo&)
     194{
     195}
     196
     197void WebIDBConnectionToClient::iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long)
     198{
     199}
     200
     201void WebIDBConnectionToClient::establishTransaction(uint64_t, const IDBTransactionInfo&)
     202{
     203}
     204
     205void WebIDBConnectionToClient::databaseConnectionClosed(uint64_t)
     206{
     207}
     208
     209void WebIDBConnectionToClient::abortOpenAndUpgradeNeeded(uint64_t, const IDBResourceIdentifier&)
     210{
     211}
     212
     213void WebIDBConnectionToClient::didFireVersionChangeEvent(uint64_t, const IDBResourceIdentifier&)
     214{
     215}
     216
    137217} // namespace WebKit
    138218

  • trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h

    r196651 r196705  
    3333#include <WebCore/IDBConnectionToClient.h>
    3434
     35namespace WebCore {
     36class IDBCursorInfo;
     37class IDBIndexInfo;
     38class IDBObjectStoreInfo;
     39class IDBRequestData;
     40class IDBTransactionInfo;
     41class SerializedScriptValue;
     42}
     43
    3544namespace WebKit {
    3645
    … …  
    4554    virtual uint64_t messageSenderDestinationID() override final { return m_identifier; }
    4655
     56    // IDBConnectionToClientDelegate
    4757    virtual void didDeleteDatabase(const WebCore::IDBResultData&) override final;
    4858    virtual void didOpenDatabase(const WebCore::IDBResultData&) override final;
    … …  
    6878    virtual void deref() override { RefCounted<WebIDBConnectionToClient>::deref(); }
    6979
     80    // Messages received from WebProcess
     81    void deleteDatabase(const WebCore::IDBRequestData&);
     82    void openDatabase(const WebCore::IDBRequestData&);
     83    void abortTransaction(const WebCore::IDBResourceIdentifier&);
     84    void commitTransaction(const WebCore::IDBResourceIdentifier&);
     85    void didFinishHandlingVersionChangeTransaction(const WebCore::IDBResourceIdentifier&);
     86    void createObjectStore(const WebCore::IDBRequestData&, const WebCore::IDBObjectStoreInfo&);
     87    void deleteObjectStore(const WebCore::IDBRequestData&, const String& objectStoreName);
     88    void clearObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier);
     89    void createIndex(const WebCore::IDBRequestData&, const WebCore::IDBIndexInfo&);
     90    void deleteIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
     91    void putOrAdd(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, const IPC::DataReference& value, bool overwriteEnabled);
     92    void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
     93    void getCount(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
     94    void deleteRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
     95    void openCursor(const WebCore::IDBRequestData&, const WebCore::IDBCursorInfo&);
     96    void iterateCursor(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, unsigned long count);
     97
     98    void establishTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBTransactionInfo&);
     99    void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
     100    void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& transactionIdentifier);
     101    void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier);
     102
    70103    void disconnectedFromWebProcess();
    71104
    … …  
    74107
    75108    virtual IPC::Connection* messageSenderConnection() override final;
     109    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&);
     110
    76111    Ref<DatabaseToWebProcessConnection> m_connection;
    77112

  • trunk/Source/WebKit2/DerivedSources.make

    r196698 r196705  
    116116    WebGeolocationManager \
    117117    WebGeolocationManagerProxy \
     118    WebIDBConnectionToClient \
     119    WebIDBConnectionToServer \
    118120    WebIDBServerConnection \
    119121    WebIconDatabase \

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r196698 r196705  
    845845                5105236F1C739D42007993CB /* WebIDBConnectionToClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */; };
    846846                510523701C739D42007993CB /* WebIDBConnectionToClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5105236E1C7393E9007993CB /* WebIDBConnectionToClient.h */; };
     847                510523741C73D38B007993CB /* WebIDBConnectionToServerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 510523731C73D37B007993CB /* WebIDBConnectionToServerMessages.h */; };
     848                510523751C73D38F007993CB /* WebIDBConnectionToServerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510523721C73D37B007993CB /* WebIDBConnectionToServerMessageReceiver.cpp */; };
     849                510523791C73DA77007993CB /* WebIDBConnectionToClientMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510523771C73DA70007993CB /* WebIDBConnectionToClientMessageReceiver.cpp */; };
     850                5105237A1C73DA77007993CB /* WebIDBConnectionToClientMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 510523781C73DA70007993CB /* WebIDBConnectionToClientMessages.h */; };
    847851                51064D35189781C4004B2FEB /* SQLiteIDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51064D33189781C4004B2FEB /* SQLiteIDBCursor.cpp */; };
    848852                51064D36189781C4004B2FEB /* SQLiteIDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 51064D34189781C4004B2FEB /* SQLiteIDBCursor.h */; };
    … …  
    28282832                5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBConnectionToClient.cpp; sourceTree = "<group>"; };
    28292833                5105236E1C7393E9007993CB /* WebIDBConnectionToClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBConnectionToClient.h; sourceTree = "<group>"; };
     2834                510523711C73D22B007993CB /* WebIDBConnectionToServer.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebIDBConnectionToServer.messages.in; sourceTree = "<group>"; };
     2835                510523721C73D37B007993CB /* WebIDBConnectionToServerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBConnectionToServerMessageReceiver.cpp; sourceTree = "<group>"; };
     2836                510523731C73D37B007993CB /* WebIDBConnectionToServerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBConnectionToServerMessages.h; sourceTree = "<group>"; };
     2837                510523761C73D9F6007993CB /* WebIDBConnectionToClient.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebIDBConnectionToClient.messages.in; sourceTree = "<group>"; };
     2838                510523771C73DA70007993CB /* WebIDBConnectionToClientMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBConnectionToClientMessageReceiver.cpp; sourceTree = "<group>"; };
     2839                510523781C73DA70007993CB /* WebIDBConnectionToClientMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBConnectionToClientMessages.h; sourceTree = "<group>"; };
    28302840                5105B0D4162F7A7A00E27709 /* NetworkProcessConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessConnection.cpp; path = Network/NetworkProcessConnection.cpp; sourceTree = "<group>"; };
    28312841                5105B0D5162F7A7A00E27709 /* NetworkProcessConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessConnection.h; path = Network/NetworkProcessConnection.h; sourceTree = "<group>"; };
    … …  
    52635273                                514129911C6428100059E714 /* WebIDBConnectionToServer.cpp */,
    52645274                                514129921C6428100059E714 /* WebIDBConnectionToServer.h */,
     5275                                510523711C73D22B007993CB /* WebIDBConnectionToServer.messages.in */,
    52655276                                51E351F1180F5C7500E53BE9 /* WebIDBFactoryBackend.cpp */,
    52665277                                51E351F2180F5C7500E53BE9 /* WebIDBFactoryBackend.h */,
    … …  
    54155426                                5105236D1C7393E9007993CB /* WebIDBConnectionToClient.cpp */,
    54165427                                5105236E1C7393E9007993CB /* WebIDBConnectionToClient.h */,
     5428                                510523761C73D9F6007993CB /* WebIDBConnectionToClient.messages.in */,
    54175429                        );
    54185430                        path = IndexedDB;
    … …  
    68876899                                51D02F68132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp */,
    68886900                                51D02F69132EC73700BEAA96 /* WebIconDatabaseProxyMessages.h */,
     6901                                510523771C73DA70007993CB /* WebIDBConnectionToClientMessageReceiver.cpp */,
     6902                                510523781C73DA70007993CB /* WebIDBConnectionToClientMessages.h */,
     6903                                510523721C73D37B007993CB /* WebIDBConnectionToServerMessageReceiver.cpp */,
     6904                                510523731C73D37B007993CB /* WebIDBConnectionToServerMessages.h */,
    68896905                                51C96116183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp */,
    68906906                                51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */,
    … …  
    71477163                                1AD01BC91905D37E00C9C45F /* _WKErrorRecoveryAttempting.h in Headers */,
    71487164                                005D158F18E4C4EB00734619 /* _WKFindDelegate.h in Headers */,
     7165                                510523741C73D38B007993CB /* WebIDBConnectionToServerMessages.h in Headers */,
    71497166                                2DEAC5CF1AC368BB00A195D8 /* _WKFindOptions.h in Headers */,
    71507167                                2E7A944A1BBD97C300945547 /* _WKFocusedElementInfo.h in Headers */,
    … …  
    75797596                                330934501315B94D0097A7BC /* WebCookieManager.h in Headers */,
    75807597                                330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */,
     7598                                5105237A1C73DA77007993CB /* WebIDBConnectionToClientMessages.h in Headers */,
    75817599                                330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
    75827600                                33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */,
    … …  
    89929010                                296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,
    89939011                                1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */,
     9012                                510523751C73D38F007993CB /* WebIDBConnectionToServerMessageReceiver.cpp in Sources */,
    89949013                                2DA944AD1884E9BA00ED86DB /* TextCheckerIOS.mm in Sources */,
    89959014                                1AA417EF12C00D87002BE67B /* TextCheckerMac.mm in Sources */,
    … …  
    91309149                                31A2EC48148997C200810D71 /* WebNotification.cpp in Sources */,
    91319150                                31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */,
     9151                                510523791C73DA77007993CB /* WebIDBConnectionToClientMessageReceiver.cpp in Sources */,
    91329152                                31312620148FF82C00BA2A39 /* WebNotificationManager.cpp in Sources */,
    91339153                                31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp

    r196651 r196705  
    3333#include "WebToDatabaseProcessConnection.h"
    3434#include <WebCore/IDBConnectionToServer.h>
     35#include <WebCore/IDBCursorInfo.h>
     36#include <WebCore/IDBError.h>
     37#include <WebCore/IDBIndexInfo.h>
     38#include <WebCore/IDBObjectStoreInfo.h>
    3539#include <WebCore/IDBOpenDBRequestImpl.h>
     40#include <WebCore/IDBRequestData.h>
     41#include <WebCore/IDBResourceIdentifier.h>
     42#include <WebCore/IDBResultData.h>
     43#include <WebCore/IDBTransactionInfo.h>
    3644
    3745using namespace WebCore;
    … …  
    158166}
    159167
     168void WebIDBConnectionToServer::didDeleteDatabase(const IDBResultData&)
     169{
     170}
     171
     172void WebIDBConnectionToServer::didOpenDatabase(const IDBResultData&)
     173{
     174}
     175
     176void WebIDBConnectionToServer::didAbortTransaction(const IDBResourceIdentifier&, const IDBError&)
     177{
     178}
     179
     180void WebIDBConnectionToServer::didCommitTransaction(const IDBResourceIdentifier&, const IDBError&)
     181{
     182}
     183
     184void WebIDBConnectionToServer::didCreateObjectStore(const IDBResultData&)
     185{
     186}
     187
     188void WebIDBConnectionToServer::didDeleteObjectStore(const IDBResultData&)
     189{
     190}
     191
     192void WebIDBConnectionToServer::didClearObjectStore(const IDBResultData&)
     193{
     194}
     195
     196void WebIDBConnectionToServer::didCreateIndex(const IDBResultData&)
     197{
     198}
     199
     200void WebIDBConnectionToServer::didDeleteIndex(const IDBResultData&)
     201{
     202}
     203
     204void WebIDBConnectionToServer::didPutOrAdd(const IDBResultData&)
     205{
     206}
     207
     208void WebIDBConnectionToServer::didGetRecord(const IDBResultData&)
     209{
     210}
     211
     212void WebIDBConnectionToServer::didGetCount(const IDBResultData&)
     213{
     214}
     215
     216void WebIDBConnectionToServer::didDeleteRecord(const IDBResultData&)
     217{
     218}
     219
     220void WebIDBConnectionToServer::didOpenCursor(const IDBResultData&)
     221{
     222}
     223
     224void WebIDBConnectionToServer::didIterateCursor(const IDBResultData&)
     225{
     226}
     227
     228
    160229} // namespace WebKit
    161230

  • trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h

    r196651 r196705  
    4444    virtual uint64_t messageSenderDestinationID() override final { return m_identifier; }
    4545
     46    // IDBConnectionToServerDelegate
    4647    virtual void deleteDatabase(WebCore::IDBRequestData&) override final;
    4748    virtual void openDatabase(WebCore::IDBRequestData&) override final;
    … …  
    6869    virtual void deref() override { RefCounted<WebIDBConnectionToServer>::deref(); }
    6970
     71    // Messages received from DatabaseProcess
     72    void didDeleteDatabase(const WebCore::IDBResultData&);
     73    void didOpenDatabase(const WebCore::IDBResultData&);
     74    void didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&);
     75    void didCommitTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&);
     76    void didCreateObjectStore(const WebCore::IDBResultData&);
     77    void didDeleteObjectStore(const WebCore::IDBResultData&);
     78    void didClearObjectStore(const WebCore::IDBResultData&);
     79    void didCreateIndex(const WebCore::IDBResultData&);
     80    void didDeleteIndex(const WebCore::IDBResultData&);
     81    void didPutOrAdd(const WebCore::IDBResultData&);
     82    void didGetRecord(const WebCore::IDBResultData&);
     83    void didGetCount(const WebCore::IDBResultData&);
     84    void didDeleteRecord(const WebCore::IDBResultData&);
     85    void didOpenCursor(const WebCore::IDBResultData&);
     86    void didIterateCursor(const WebCore::IDBResultData&);
     87
    7088private:
    7189    WebIDBConnectionToServer();
    7290
    7391    virtual IPC::Connection* messageSenderConnection() override final;
     92    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&);
    7493
    7594    uint64_t m_identifier;
Note: See TracChangeset for help on using the changeset viewer.