Changeset 221093 in webkit


Ignore:
Timestamp:
Aug 23, 2017 12:45:48 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[CacheAPI] Introduce a WebKit::CacheStorage namespace
​https://bugs.webkit.org/show_bug.cgi?id=175885

Patch by Youenn Fablet <​youenn@apple.com> on 2017-08-23
Reviewed by Alex Christensen.

Introducing WebKit::CacheStorage namespace.
Splitting CacheStorageEngine.h in three files.
Updating client code accordingly.

  • NetworkProcess/cache/CacheStorage.h: Added.
  • NetworkProcess/cache/CacheStorageEngine.cpp:

(WebKit::CacheStorage::globalEngineMap):
(WebKit::CacheStorage::Engine::from):
(WebKit::CacheStorage::Engine::destroyEngine):
(WebKit::CacheStorage::Engine::defaultEngine):
(WebKit::CacheStorage::Engine::open):
(WebKit::CacheStorage::Engine::remove):
(WebKit::CacheStorage::Engine::retrieveCaches):
(WebKit::CacheStorage::Engine::retrieveRecords):
(WebKit::CacheStorage::Engine::putRecords):
(WebKit::CacheStorage::Engine::deleteMatchingRecords):
(WebKit::CacheStorage::Engine::writeCachesToDisk):
(WebKit::CacheStorage::Engine::readCachesFromDisk):
(WebKit::CacheStorage::Engine::readCache):
(WebKit::CacheStorage::Engine::writeCacheRecords):
(WebKit::CacheStorage::Engine::removeCacheRecords):
(WebKit::CacheStorage::Engine::cache):
(WebKit::CacheStorage::Engine::caches const):
(WebKit::CacheStorage::Engine::queryCache):

  • NetworkProcess/cache/CacheStorageEngineCache.h: Added.
  • NetworkProcess/cache/CacheStorageEngineConnection.cpp:

(WebKit::CacheStorageEngineConnection::open):
(WebKit::CacheStorageEngineConnection::remove):
(WebKit::CacheStorageEngineConnection::caches):
(WebKit::CacheStorageEngineConnection::records):
(WebKit::CacheStorageEngineConnection::deleteMatchingRecords):
(WebKit::CacheStorageEngineConnection::putRecords):

  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/Cache/WebCacheStorageConnection.cpp:

(WebKit::WebCacheStorageConnection::openCompleted):
(WebKit::WebCacheStorageConnection::removeCompleted):
(WebKit::WebCacheStorageConnection::updateCaches):
(WebKit::WebCacheStorageConnection::updateRecords):
(WebKit::WebCacheStorageConnection::deleteRecordsCompleted):
(WebKit::WebCacheStorageConnection::putRecordsCompleted):

  • WebProcess/Cache/WebCacheStorageConnection.h:
Location:
trunk/Source/WebKit
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r221086 r221093  
     12017-08-23  Youenn Fablet  <youenn@apple.com>
     2
     3        [CacheAPI] Introduce a WebKit::CacheStorage namespace
     4        https://bugs.webkit.org/show_bug.cgi?id=175885
     5
     6        Reviewed by Alex Christensen.
     7
     8        Introducing WebKit::CacheStorage namespace.
     9        Splitting CacheStorageEngine.h in three files.
     10        Updating client code accordingly.
     11
     12        * NetworkProcess/cache/CacheStorage.h: Added.
     13        * NetworkProcess/cache/CacheStorageEngine.cpp:
     14        (WebKit::CacheStorage::globalEngineMap):
     15        (WebKit::CacheStorage::Engine::from):
     16        (WebKit::CacheStorage::Engine::destroyEngine):
     17        (WebKit::CacheStorage::Engine::defaultEngine):
     18        (WebKit::CacheStorage::Engine::open):
     19        (WebKit::CacheStorage::Engine::remove):
     20        (WebKit::CacheStorage::Engine::retrieveCaches):
     21        (WebKit::CacheStorage::Engine::retrieveRecords):
     22        (WebKit::CacheStorage::Engine::putRecords):
     23        (WebKit::CacheStorage::Engine::deleteMatchingRecords):
     24        (WebKit::CacheStorage::Engine::writeCachesToDisk):
     25        (WebKit::CacheStorage::Engine::readCachesFromDisk):
     26        (WebKit::CacheStorage::Engine::readCache):
     27        (WebKit::CacheStorage::Engine::writeCacheRecords):
     28        (WebKit::CacheStorage::Engine::removeCacheRecords):
     29        (WebKit::CacheStorage::Engine::cache):
     30        (WebKit::CacheStorage::Engine::caches const):
     31        (WebKit::CacheStorage::Engine::queryCache):
     32        * NetworkProcess/cache/CacheStorageEngineCache.h: Added.
     33        * NetworkProcess/cache/CacheStorageEngineConnection.cpp:
     34        (WebKit::CacheStorageEngineConnection::open):
     35        (WebKit::CacheStorageEngineConnection::remove):
     36        (WebKit::CacheStorageEngineConnection::caches):
     37        (WebKit::CacheStorageEngineConnection::records):
     38        (WebKit::CacheStorageEngineConnection::deleteMatchingRecords):
     39        (WebKit::CacheStorageEngineConnection::putRecords):
     40        * WebKit.xcodeproj/project.pbxproj:
     41        * WebProcess/Cache/WebCacheStorageConnection.cpp:
     42        (WebKit::WebCacheStorageConnection::openCompleted):
     43        (WebKit::WebCacheStorageConnection::removeCompleted):
     44        (WebKit::WebCacheStorageConnection::updateCaches):
     45        (WebKit::WebCacheStorageConnection::updateRecords):
     46        (WebKit::WebCacheStorageConnection::deleteRecordsCompleted):
     47        (WebKit::WebCacheStorageConnection::putRecordsCompleted):
     48        * WebProcess/Cache/WebCacheStorageConnection.h:
     49
    1502017-08-23  Youenn Fablet  <youenn@apple.com>
    251

  • trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp

    r221085 r221093  
    3535namespace WebKit {
    3636
    37 static HashMap<PAL::SessionID, std::unique_ptr<CacheStorageEngine>>& globalEngineMap()
    38 {
    39     static NeverDestroyed<HashMap<PAL::SessionID, std::unique_ptr<CacheStorageEngine>>> map;
     37namespace CacheStorage {
     38
     39static HashMap<PAL::SessionID, std::unique_ptr<Engine>>& globalEngineMap()
     40{
     41    static NeverDestroyed<HashMap<PAL::SessionID, std::unique_ptr<Engine>>> map;
    4042    return map;
    4143}
    4244
    43 CacheStorageEngine& CacheStorageEngine::from(PAL::SessionID sessionID)
     45Engine& Engine::from(PAL::SessionID sessionID)
    4446{
    4547    if (sessionID == PAL::SessionID::defaultSessionID())
    … …  
    4749
    4850    return *globalEngineMap().ensure(sessionID, [] {
    49         return std::make_unique<CacheStorageEngine>();
     51        return std::make_unique<Engine>();
    5052    }).iterator->value;
    5153}
    5254
    53 void CacheStorageEngine::destroyEngine(PAL::SessionID sessionID)
     55void Engine::destroyEngine(PAL::SessionID sessionID)
    5456{
    5557    ASSERT(sessionID != PAL::SessionID::defaultSessionID());
    … …  
    5759}
    5860
    59 CacheStorageEngine& CacheStorageEngine::defaultEngine()
    60 {
    61     static NeverDestroyed<std::unique_ptr<CacheStorageEngine>> defaultEngine = { std::make_unique<CacheStorageEngine>() };
     61Engine& Engine::defaultEngine()
     62{
     63    static NeverDestroyed<std::unique_ptr<Engine>> defaultEngine = { std::make_unique<Engine>() };
    6264    return *defaultEngine.get();
    6365}
    6466
    65 void CacheStorageEngine::open(const String& origin, const String& cacheName, CacheIdentifierCallback&& callback)
     67void Engine::open(const String& origin, const String& cacheName, CacheIdentifierCallback&& callback)
    6668{
    6769    readCachesFromDisk(origin, [this, cacheName, callback = WTFMove(callback)](CachesOrError&& cachesOrError) mutable {
    … …  
    9092}
    9193
    92 void CacheStorageEngine::remove(uint64_t cacheIdentifier, CacheIdentifierCallback&& callback)
     94void Engine::remove(uint64_t cacheIdentifier, CacheIdentifierCallback&& callback)
    9395{
    9496    std::optional<Cache> removedCache;
    … …  
    115117}
    116118
    117 void CacheStorageEngine::retrieveCaches(const String& origin, CacheInfosCallback&& callback)
     119void Engine::retrieveCaches(const String& origin, CacheInfosCallback&& callback)
    118120{
    119121    readCachesFromDisk(origin, [this, callback = WTFMove(callback)](CachesOrError&& cachesOrError) mutable {
    … …  
    134136}
    135137
    136 void CacheStorageEngine::retrieveRecords(uint64_t cacheIdentifier, RecordsCallback&& callback)
     138void Engine::retrieveRecords(uint64_t cacheIdentifier, RecordsCallback&& callback)
    137139{
    138140    readCache(cacheIdentifier, [callback = WTFMove(callback)](CacheOrError&& result) mutable {
    … …  
    153155}
    154156
    155 void CacheStorageEngine::putRecords(uint64_t cacheIdentifier, Vector<Record>&& records, RecordIdentifiersCallback&& callback)
     157void Engine::putRecords(uint64_t cacheIdentifier, Vector<Record>&& records, RecordIdentifiersCallback&& callback)
    156158{
    157159    readCache(cacheIdentifier, [this, cacheIdentifier, records = WTFMove(records), callback = WTFMove(callback)](CacheOrError&& result) mutable {
    … …  
    167169        recordIdentifiers.reserveInitialCapacity(records.size());
    168170        for (auto& record : records) {
    169             auto matchingRecords = CacheStorageEngine::queryCache(cache.records, record.request, options);
     171            auto matchingRecords = Engine::queryCache(cache.records, record.request, options);
    170172            if (matchingRecords.isEmpty()) {
    171173                record.identifier = ++cache.nextRecordIdentifier;
    … …  
    192194}
    193195
    194 void CacheStorageEngine::deleteMatchingRecords(uint64_t cacheIdentifier, WebCore::ResourceRequest&& request, WebCore::CacheQueryOptions&& options, RecordIdentifiersCallback&& callback)
     196void Engine::deleteMatchingRecords(uint64_t cacheIdentifier, WebCore::ResourceRequest&& request, WebCore::CacheQueryOptions&& options, RecordIdentifiersCallback&& callback)
    195197{
    196198    readCache(cacheIdentifier, [this, cacheIdentifier, request = WTFMove(request), options = WTFMove(options), callback = WTFMove(callback)](CacheOrError&& result) mutable {
    … …  
    231233}
    232234
    233 void CacheStorageEngine::writeCachesToDisk(Function<void(std::optional<Error>&&)>&& callback)
     235void Engine::writeCachesToDisk(Function<void(std::optional<Error>&&)>&& callback)
    234236{
    235237    // FIXME: Implement writing.
    … …  
    237239}
    238240
    239 void CacheStorageEngine::readCachesFromDisk(const String& origin, CachesCallback&& callback)
     241void Engine::readCachesFromDisk(const String& origin, CachesCallback&& callback)
    240242{
    241243    // FIXME: Implement reading.
    … …  
    248250}
    249251
    250 void CacheStorageEngine::readCache(uint64_t cacheIdentifier, CacheCallback&& callback)
     252void Engine::readCache(uint64_t cacheIdentifier, CacheCallback&& callback)
    251253{
    252254    // FIXME: Implement reading.
    … …  
    259261}
    260262
    261 void CacheStorageEngine::writeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback)
     263void Engine::writeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback)
    262264{
    263265    // FIXME: Implement writing.
    … …  
    265267}
    266268
    267 void CacheStorageEngine::removeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback)
     269void Engine::removeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback)
    268270{
    269271    // FIXME: Implement writing.
    … …  
    271273}
    272274
    273 CacheStorageEngine::Cache* CacheStorageEngine::cache(uint64_t cacheIdentifier)
     275Cache* Engine::cache(uint64_t cacheIdentifier)
    274276{
    275277    Cache* result = nullptr;
    … …  
    289291}
    290292
    291 Vector<uint64_t> CacheStorageEngine::queryCache(const Vector<Record>& records, const WebCore::ResourceRequest& request, const WebCore::CacheQueryOptions& options)
     293Vector<uint64_t> Engine::queryCache(const Vector<Record>& records, const WebCore::ResourceRequest& request, const WebCore::CacheQueryOptions& options)
    292294{
    293295    if (!options.ignoreMethod && request.httpMethod() != "GET")
    … …  
    302304}
    303305
    304 }
     306} // namespace CacheStorage
     307
     308} // namespace WebKit
     309

  • trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.h

    r221085 r221093  
    2626#pragma once
    2727
    28 #include "WebCoreArgumentCoders.h"
    29 #include <WebCore/CacheStorageConnection.h>
    30 #include <wtf/Forward.h>
     28#include "CacheStorageEngineCache.h"
    3129#include <wtf/HashMap.h>
    32 #include <wtf/Vector.h>
    33 #include <wtf/text/WTFString.h>
    3430
    3531namespace IPC {
    … …  
    4339namespace WebKit {
    4440
    45 class NetworkConnectionToWebProcess;
     41namespace CacheStorage {
    4642
    47 class CacheStorageEngine {
     43class Engine {
    4844public:
    49     static CacheStorageEngine& from(PAL::SessionID);
     45    static Engine& from(PAL::SessionID);
    5046    static void destroyEngine(PAL::SessionID);
    51 
    52     enum class Error {
    53         Internal
    54     };
    55     using Record = WebCore::CacheStorageConnection::Record;
    56 
    57     using CacheIdentifierOrError = Expected<uint64_t, Error>;
    58     using CacheIdentifierCallback = Function<void(CacheIdentifierOrError&&)>;
    59 
    60     using CacheInfosOrError = Expected<Vector<WebCore::CacheStorageConnection::CacheInfo>, Error>;
    61     using CacheInfosCallback = Function<void(CacheInfosOrError&&)>;
    62 
    63     using RecordsOrError = Expected<Vector<Record>, Error>;
    64     using RecordsCallback = Function<void(RecordsOrError&&)>;
    65 
    66     using RecordIdentifiersOrError = Expected<Vector<uint64_t>, Error>;
    67     using RecordIdentifiersCallback = Function<void(RecordIdentifiersOrError&&)>;
    68 
    69     using CompletionCallback = Function<void(std::optional<Error>&&)>;
    7047
    7148    void open(const String& origin, const String& cacheName, CacheIdentifierCallback&&);
    … …  
    7855
    7956private:
    80     static CacheStorageEngine& defaultEngine();
    81 
    82     struct Cache {
    83         uint64_t identifier;
    84         String name;
    85         Vector<Record> records;
    86         uint64_t nextRecordIdentifier { 0 };
    87     };
     57    static Engine& defaultEngine();
    8858
    8959    void writeCachesToDisk(CompletionCallback&&);
    … …  
    10979};
    11080
    111 }
     81} // namespace CacheStorage
    11282
    113 namespace WTF {
    114 template<> struct EnumTraits<WebKit::CacheStorageEngine::Error> {
    115     using values = EnumValues<
    116         WebKit::CacheStorageEngine::Error,
    117         WebKit::CacheStorageEngine::Error::Internal
    118     >;
    119 };
    120 }
     83} // namespace WebKit

  • trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp

    r220917 r221093  
    3030#include "NetworkConnectionToWebProcess.h"
    3131#include "WebCacheStorageConnectionMessages.h"
    32 #include "WebCoreArgumentCoders.h"
    3332#include <WebCore/CacheQueryOptions.h>
     33
     34using namespace WebKit::CacheStorage;
    3435
    3536namespace WebKit {
    … …  
    4243void CacheStorageEngineConnection::open(PAL::SessionID sessionID, uint64_t requestIdentifier, const String& origin, const String& cacheName)
    4344{
    44     CacheStorageEngine::from(sessionID).open(origin, cacheName, [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](CacheStorageEngine::CacheIdentifierOrError&& result) {
     45    Engine::from(sessionID).open(origin, cacheName, [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](CacheIdentifierOrError&& result) {
    4546        m_connection.connection().send(Messages::WebCacheStorageConnection::OpenCompleted(requestIdentifier, result), sessionID.sessionID());
    4647    });
    … …  
    4950void CacheStorageEngineConnection::remove(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier)
    5051{
    51     CacheStorageEngine::from(sessionID).remove(cacheIdentifier, [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](CacheStorageEngine::CacheIdentifierOrError&& result) {
     52    Engine::from(sessionID).remove(cacheIdentifier, [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](CacheIdentifierOrError&& result) {
    5253        m_connection.connection().send(Messages::WebCacheStorageConnection::RemoveCompleted(requestIdentifier, result), sessionID.sessionID());
    5354    });
    … …  
    5657void CacheStorageEngineConnection::caches(PAL::SessionID sessionID, uint64_t requestIdentifier, const String& origin)
    5758{
    58     CacheStorageEngine::from(sessionID).retrieveCaches(origin, [protectedThis = makeRef(*this), this, sessionID, origin, requestIdentifier](CacheStorageEngine::CacheInfosOrError&& result) {
     59    Engine::from(sessionID).retrieveCaches(origin, [protectedThis = makeRef(*this), this, sessionID, origin, requestIdentifier](CacheInfosOrError&& result) {
    5960        m_connection.connection().send(Messages::WebCacheStorageConnection::UpdateCaches(requestIdentifier, result), sessionID.sessionID());
    6061    });
    … …  
    6364void CacheStorageEngineConnection::records(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier)
    6465{
    65     CacheStorageEngine::from(sessionID).retrieveRecords(cacheIdentifier, [protectedThis = makeRef(*this), this, sessionID, cacheIdentifier, requestIdentifier](CacheStorageEngine::RecordsOrError&& result) {
     66    Engine::from(sessionID).retrieveRecords(cacheIdentifier, [protectedThis = makeRef(*this), this, sessionID, cacheIdentifier, requestIdentifier](RecordsOrError&& result) {
    6667        m_connection.connection().send(Messages::WebCacheStorageConnection::UpdateRecords(requestIdentifier, result), sessionID.sessionID());
    6768    });
    … …  
    7071void CacheStorageEngineConnection::deleteMatchingRecords(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier, WebCore::ResourceRequest&& request, WebCore::CacheQueryOptions&& options)
    7172{
    72     CacheStorageEngine::from(sessionID).deleteMatchingRecords(cacheIdentifier, WTFMove(request), WTFMove(options), [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](CacheStorageEngine::RecordIdentifiersOrError&& result) {
     73    Engine::from(sessionID).deleteMatchingRecords(cacheIdentifier, WTFMove(request), WTFMove(options), [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](RecordIdentifiersOrError&& result) {
    7374        m_connection.connection().send(Messages::WebCacheStorageConnection::DeleteRecordsCompleted(requestIdentifier, result), sessionID.sessionID());
    7475    });
    … …  
    7778void CacheStorageEngineConnection::putRecords(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier, Vector<WebCore::CacheStorageConnection::Record>&& records)
    7879{
    79     CacheStorageEngine::from(sessionID).putRecords(cacheIdentifier, WTFMove(records), [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](CacheStorageEngine::RecordIdentifiersOrError&& result) {
     80    Engine::from(sessionID).putRecords(cacheIdentifier, WTFMove(records), [protectedThis = makeRef(*this), this, sessionID, requestIdentifier](RecordIdentifiersOrError&& result) {
    8081        m_connection.connection().send(Messages::WebCacheStorageConnection::PutRecordsCompleted(requestIdentifier, result), sessionID.sessionID());
    8182    });

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

    r220977 r221093  
    907907                41DC459F1E3DBDA500B11F51 /* WebRTCSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F31E3BFE7F001AE678 /* WebRTCSocket.h */; };
    908908                41DC45A11E3DC53F00B11F51 /* WebRTCResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DC45A01E3DC53C00B11F51 /* WebRTCResolver.cpp */; };
     909                41FABD291F4DE001006A6C97 /* CacheStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FABD271F4DDFDC006A6C97 /* CacheStorage.h */; };
     910                41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FABD281F4DDFDC006A6C97 /* CacheStorageEngineCache.h */; };
    909911                41FAF5F51E3C0649001AE678 /* WebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F41E3C0641001AE678 /* WebRTCResolver.h */; };
    910912                41FAF5F81E3C1021001AE678 /* LibWebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F61E3C0B47001AE678 /* LibWebRTCResolver.h */; };
    … …  
    10351037                517A530F1F47A86200DCDC0A /* WebSWClientConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A530E1F47A84300DCDC0A /* WebSWClientConnectionMessageReceiver.cpp */; };
    10361038                517A53101F47A86200DCDC0A /* WebSWClientConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A530D1F47A84300DCDC0A /* WebSWClientConnectionMessages.h */; };
     1039                517CF0E3163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp */; };
    10371040                517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
    1038                 517CF0E3163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp */; };
    10391041                517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */; };
    10401042                517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; };
    … …  
    31783180                41DC459D1E3DBCF000B11F51 /* WebRTCSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebRTCSocket.cpp; path = Network/webrtc/WebRTCSocket.cpp; sourceTree = "<group>"; };
    31793181                41DC45A01E3DC53C00B11F51 /* WebRTCResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebRTCResolver.cpp; path = Network/webrtc/WebRTCResolver.cpp; sourceTree = "<group>"; };
     3182                41FABD271F4DDFDC006A6C97 /* CacheStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheStorage.h; sourceTree = "<group>"; };
     3183                41FABD281F4DDFDC006A6C97 /* CacheStorageEngineCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheStorageEngineCache.h; sourceTree = "<group>"; };
    31803184                41FAF5F31E3BFE7F001AE678 /* WebRTCSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebRTCSocket.h; path = Network/webrtc/WebRTCSocket.h; sourceTree = "<group>"; };
    31813185                41FAF5F41E3C0641001AE678 /* WebRTCResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebRTCResolver.h; path = Network/webrtc/WebRTCResolver.h; sourceTree = "<group>"; };
    … …  
    33203324                517A530D1F47A84300DCDC0A /* WebSWClientConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSWClientConnectionMessages.h; sourceTree = "<group>"; };
    33213325                517A530E1F47A84300DCDC0A /* WebSWClientConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSWClientConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
     3326                517CF0E1163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCacheStorageConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
    33223327                517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
    3323                 517CF0E1163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCacheStorageConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
    33243328                517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStorageEngineConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
    33253329                517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkProcessConnectionMessages.h; sourceTree = "<group>"; };
    … …  
    81918195                        isa = PBXGroup;
    81928196                        children = (
     8197                                41FABD271F4DDFDC006A6C97 /* CacheStorage.h */,
    81938198                                41897ED61F415D860016FA42 /* CacheStorageEngine.cpp */,
    81948199                                41897ED21F415D850016FA42 /* CacheStorageEngine.h */,
     8200                                41FABD281F4DDFDC006A6C97 /* CacheStorageEngineCache.h */,
    81958201                                41897ED31F415D850016FA42 /* CacheStorageEngineConnection.cpp */,
    81968202                                41897ED41F415D850016FA42 /* CacheStorageEngineConnection.h */,
    … …  
    84258431                                1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */,
    84268432                                BC3065FA1259344E00E71278 /* CacheModel.h in Headers */,
     8433                                41FABD291F4DE001006A6C97 /* CacheStorage.h in Headers */,
    84278434                                41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */,
     8435                                41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */,
    84288436                                41897EDA1F415D8A0016FA42 /* CacheStorageEngineConnection.h in Headers */,
    84298437                                1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */,

  • trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp

    r220917 r221093  
    3434#include "WebProcess.h"
    3535#include <wtf/MainThread.h>
     36
     37using namespace WebKit::CacheStorage;
    3638
    3739namespace WebKit {
    … …  
    8385}
    8486
    85 void WebCacheStorageConnection::openCompleted(uint64_t requestIdentifier, CacheStorageEngine::CacheIdentifierOrError&& result)
     87void WebCacheStorageConnection::openCompleted(uint64_t requestIdentifier, CacheIdentifierOrError&& result)
    8688{
    8789    CacheStorageConnection::openCompleted(requestIdentifier, result.hasValue() ? result.value() : 0, !result.hasValue() ? Error::Internal : Error::None);
    8890}
    8991
    90 void WebCacheStorageConnection::removeCompleted(uint64_t requestIdentifier, CacheStorageEngine::CacheIdentifierOrError&& result)
     92void WebCacheStorageConnection::removeCompleted(uint64_t requestIdentifier, CacheIdentifierOrError&& result)
    9193{
    9294    CacheStorageConnection::removeCompleted(requestIdentifier, result.hasValue() ? result.value() : 0, !result.hasValue() ? Error::Internal : Error::None);
    9395}
    9496
    95 void WebCacheStorageConnection::updateCaches(uint64_t requestIdentifier, CacheStorageEngine::CacheInfosOrError&& result)
     97void WebCacheStorageConnection::updateCaches(uint64_t requestIdentifier, CacheInfosOrError&& result)
    9698{
    9799    CacheStorageConnection::updateCaches(requestIdentifier, result.hasValue() ? result.value() : Vector<CacheInfo>());
    98100}
    99101
    100 void WebCacheStorageConnection::updateRecords(uint64_t requestIdentifier, CacheStorageEngine::RecordsOrError&& result)
     102void WebCacheStorageConnection::updateRecords(uint64_t requestIdentifier, RecordsOrError&& result)
    101103{
    102104    CacheStorageConnection::updateRecords(requestIdentifier, result.hasValue() ? WTFMove(result.value()) : Vector<Record>());
    103105}
    104106
    105 void WebCacheStorageConnection::deleteRecordsCompleted(uint64_t requestIdentifier, CacheStorageEngine::RecordIdentifiersOrError&& result)
     107void WebCacheStorageConnection::deleteRecordsCompleted(uint64_t requestIdentifier, RecordIdentifiersOrError&& result)
    106108{
    107109    CacheStorageConnection::deleteRecordsCompleted(requestIdentifier, result.hasValue() ? result.value() : Vector<uint64_t>(), !result.hasValue() ? Error::Internal : Error::None);
    108110}
    109111
    110 void WebCacheStorageConnection::putRecordsCompleted(uint64_t requestIdentifier, CacheStorageEngine::RecordIdentifiersOrError&& result)
     112void WebCacheStorageConnection::putRecordsCompleted(uint64_t requestIdentifier, RecordIdentifiersOrError&& result)
    111113{
    112114    CacheStorageConnection::putRecordsCompleted(requestIdentifier, result.hasValue() ? result.value() : Vector<uint64_t>(), !result.hasValue() ? Error::Internal : Error::None);

  • trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.h

    r220917 r221093  
    2626#pragma once
    2727
    28 #include "CacheStorageEngine.h"
     28#include "CacheStorage.h"
    2929#include <WebCore/CacheStorageConnection.h>
    3030#include <wtf/HashMap.h>
    3131
    3232namespace IPC {
     33class Connection;
    3334class Decoder;
    3435class Encoder;
    … …  
    6162    void doBatchPutOperation(uint64_t requestIdentifier, uint64_t cacheIdentifier, Vector<Record>&&) final;
    6263
    63     void openCompleted(uint64_t requestIdentifier, CacheStorageEngine::CacheIdentifierOrError&&);
    64     void removeCompleted(uint64_t requestIdentifier, CacheStorageEngine::CacheIdentifierOrError&&);
    65     void updateCaches(uint64_t requestIdentifier, CacheStorageEngine::CacheInfosOrError&&);
     64    void openCompleted(uint64_t requestIdentifier, CacheStorage::CacheIdentifierOrError&&);
     65    void removeCompleted(uint64_t requestIdentifier, CacheStorage::CacheIdentifierOrError&&);
     66    void updateCaches(uint64_t requestIdentifier, CacheStorage::CacheInfosOrError&&);
    6667
    67     void updateRecords(uint64_t requestIdentifier, CacheStorageEngine::RecordsOrError&&);
    68     void deleteRecordsCompleted(uint64_t requestIdentifier, CacheStorageEngine::RecordIdentifiersOrError&&);
    69     void putRecordsCompleted(uint64_t requestIdentifier, CacheStorageEngine::RecordIdentifiersOrError&&);
     68    void updateRecords(uint64_t requestIdentifier, CacheStorage::RecordsOrError&&);
     69    void deleteRecordsCompleted(uint64_t requestIdentifier, CacheStorage::RecordIdentifiersOrError&&);
     70    void putRecordsCompleted(uint64_t requestIdentifier, CacheStorage::RecordIdentifiersOrError&&);
    7071
    7172    WebCacheStorageProvider& m_provider;

  • trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.messages.in

    r220917 r221093  
    2222
    2323messages -> WebCacheStorageConnection {
    24     OpenCompleted(uint64_t requestIdentifier, WebKit::CacheStorageEngine::CacheIdentifierOrError result);
    25     RemoveCompleted(uint64_t requestIdentifier, WebKit::CacheStorageEngine::CacheIdentifierOrError result);
    26     UpdateCaches(uint64_t requestIdentifier, WebKit::CacheStorageEngine::CacheInfosOrError result);
     24    OpenCompleted(uint64_t requestIdentifier, WebKit::CacheStorage::CacheIdentifierOrError result);
     25    RemoveCompleted(uint64_t requestIdentifier, WebKit::CacheStorage::CacheIdentifierOrError result);
     26    UpdateCaches(uint64_t requestIdentifier, WebKit::CacheStorage::CacheInfosOrError result);
    2727
    28     UpdateRecords(uint64_t requestIdentifier, WebKit::CacheStorageEngine::RecordsOrError result);
    29     DeleteRecordsCompleted(uint64_t requestIdentifier, WebKit::CacheStorageEngine::RecordIdentifiersOrError result);
    30     PutRecordsCompleted(uint64_t requestIdentifier, WebKit::CacheStorageEngine::RecordIdentifiersOrError result);
     28    UpdateRecords(uint64_t requestIdentifier, WebKit::CacheStorage::RecordsOrError result);
     29    DeleteRecordsCompleted(uint64_t requestIdentifier, WebKit::CacheStorage::RecordIdentifiersOrError result);
     30    PutRecordsCompleted(uint64_t requestIdentifier, WebKit::CacheStorage::RecordIdentifiersOrError result);
    3131}
Note: See TracChangeset for help on using the changeset viewer.