Changeset 221093 in webkit
- Timestamp:
- Aug 23, 2017 12:45:48 PM (7 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r221086 r221093 1 2017-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 1 50 2017-08-23 Youenn Fablet <youenn@apple.com> 2 51 -
trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
r221085 r221093 35 35 namespace WebKit { 36 36 37 static HashMap<PAL::SessionID, std::unique_ptr<CacheStorageEngine>>& globalEngineMap() 38 { 39 static NeverDestroyed<HashMap<PAL::SessionID, std::unique_ptr<CacheStorageEngine>>> map; 37 namespace CacheStorage { 38 39 static HashMap<PAL::SessionID, std::unique_ptr<Engine>>& globalEngineMap() 40 { 41 static NeverDestroyed<HashMap<PAL::SessionID, std::unique_ptr<Engine>>> map; 40 42 return map; 41 43 } 42 44 43 CacheStorageEngine& CacheStorageEngine::from(PAL::SessionID sessionID)45 Engine& Engine::from(PAL::SessionID sessionID) 44 46 { 45 47 if (sessionID == PAL::SessionID::defaultSessionID()) … … 47 49 48 50 return *globalEngineMap().ensure(sessionID, [] { 49 return std::make_unique< CacheStorageEngine>();51 return std::make_unique<Engine>(); 50 52 }).iterator->value; 51 53 } 52 54 53 void CacheStorageEngine::destroyEngine(PAL::SessionID sessionID)55 void Engine::destroyEngine(PAL::SessionID sessionID) 54 56 { 55 57 ASSERT(sessionID != PAL::SessionID::defaultSessionID()); … … 57 59 } 58 60 59 CacheStorageEngine& CacheStorageEngine::defaultEngine()60 { 61 static NeverDestroyed<std::unique_ptr< CacheStorageEngine>> defaultEngine = { std::make_unique<CacheStorageEngine>() };61 Engine& Engine::defaultEngine() 62 { 63 static NeverDestroyed<std::unique_ptr<Engine>> defaultEngine = { std::make_unique<Engine>() }; 62 64 return *defaultEngine.get(); 63 65 } 64 66 65 void CacheStorageEngine::open(const String& origin, const String& cacheName, CacheIdentifierCallback&& callback)67 void Engine::open(const String& origin, const String& cacheName, CacheIdentifierCallback&& callback) 66 68 { 67 69 readCachesFromDisk(origin, [this, cacheName, callback = WTFMove(callback)](CachesOrError&& cachesOrError) mutable { … … 90 92 } 91 93 92 void CacheStorageEngine::remove(uint64_t cacheIdentifier, CacheIdentifierCallback&& callback)94 void Engine::remove(uint64_t cacheIdentifier, CacheIdentifierCallback&& callback) 93 95 { 94 96 std::optional<Cache> removedCache; … … 115 117 } 116 118 117 void CacheStorageEngine::retrieveCaches(const String& origin, CacheInfosCallback&& callback)119 void Engine::retrieveCaches(const String& origin, CacheInfosCallback&& callback) 118 120 { 119 121 readCachesFromDisk(origin, [this, callback = WTFMove(callback)](CachesOrError&& cachesOrError) mutable { … … 134 136 } 135 137 136 void CacheStorageEngine::retrieveRecords(uint64_t cacheIdentifier, RecordsCallback&& callback)138 void Engine::retrieveRecords(uint64_t cacheIdentifier, RecordsCallback&& callback) 137 139 { 138 140 readCache(cacheIdentifier, [callback = WTFMove(callback)](CacheOrError&& result) mutable { … … 153 155 } 154 156 155 void CacheStorageEngine::putRecords(uint64_t cacheIdentifier, Vector<Record>&& records, RecordIdentifiersCallback&& callback)157 void Engine::putRecords(uint64_t cacheIdentifier, Vector<Record>&& records, RecordIdentifiersCallback&& callback) 156 158 { 157 159 readCache(cacheIdentifier, [this, cacheIdentifier, records = WTFMove(records), callback = WTFMove(callback)](CacheOrError&& result) mutable { … … 167 169 recordIdentifiers.reserveInitialCapacity(records.size()); 168 170 for (auto& record : records) { 169 auto matchingRecords = CacheStorageEngine::queryCache(cache.records, record.request, options);171 auto matchingRecords = Engine::queryCache(cache.records, record.request, options); 170 172 if (matchingRecords.isEmpty()) { 171 173 record.identifier = ++cache.nextRecordIdentifier; … … 192 194 } 193 195 194 void CacheStorageEngine::deleteMatchingRecords(uint64_t cacheIdentifier, WebCore::ResourceRequest&& request, WebCore::CacheQueryOptions&& options, RecordIdentifiersCallback&& callback)196 void Engine::deleteMatchingRecords(uint64_t cacheIdentifier, WebCore::ResourceRequest&& request, WebCore::CacheQueryOptions&& options, RecordIdentifiersCallback&& callback) 195 197 { 196 198 readCache(cacheIdentifier, [this, cacheIdentifier, request = WTFMove(request), options = WTFMove(options), callback = WTFMove(callback)](CacheOrError&& result) mutable { … … 231 233 } 232 234 233 void CacheStorageEngine::writeCachesToDisk(Function<void(std::optional<Error>&&)>&& callback)235 void Engine::writeCachesToDisk(Function<void(std::optional<Error>&&)>&& callback) 234 236 { 235 237 // FIXME: Implement writing. … … 237 239 } 238 240 239 void CacheStorageEngine::readCachesFromDisk(const String& origin, CachesCallback&& callback)241 void Engine::readCachesFromDisk(const String& origin, CachesCallback&& callback) 240 242 { 241 243 // FIXME: Implement reading. … … 248 250 } 249 251 250 void CacheStorageEngine::readCache(uint64_t cacheIdentifier, CacheCallback&& callback)252 void Engine::readCache(uint64_t cacheIdentifier, CacheCallback&& callback) 251 253 { 252 254 // FIXME: Implement reading. … … 259 261 } 260 262 261 void CacheStorageEngine::writeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback)263 void Engine::writeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback) 262 264 { 263 265 // FIXME: Implement writing. … … 265 267 } 266 268 267 void CacheStorageEngine::removeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback)269 void Engine::removeCacheRecords(uint64_t cacheIdentifier, Vector<uint64_t>&& recordsIdentifiers, RecordIdentifiersCallback&& callback) 268 270 { 269 271 // FIXME: Implement writing. … … 271 273 } 272 274 273 Cache StorageEngine::Cache* CacheStorageEngine::cache(uint64_t cacheIdentifier)275 Cache* Engine::cache(uint64_t cacheIdentifier) 274 276 { 275 277 Cache* result = nullptr; … … 289 291 } 290 292 291 Vector<uint64_t> CacheStorageEngine::queryCache(const Vector<Record>& records, const WebCore::ResourceRequest& request, const WebCore::CacheQueryOptions& options)293 Vector<uint64_t> Engine::queryCache(const Vector<Record>& records, const WebCore::ResourceRequest& request, const WebCore::CacheQueryOptions& options) 292 294 { 293 295 if (!options.ignoreMethod && request.httpMethod() != "GET") … … 302 304 } 303 305 304 } 306 } // namespace CacheStorage 307 308 } // namespace WebKit 309 -
trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.h
r221085 r221093 26 26 #pragma once 27 27 28 #include "WebCoreArgumentCoders.h" 29 #include <WebCore/CacheStorageConnection.h> 30 #include <wtf/Forward.h> 28 #include "CacheStorageEngineCache.h" 31 29 #include <wtf/HashMap.h> 32 #include <wtf/Vector.h>33 #include <wtf/text/WTFString.h>34 30 35 31 namespace IPC { … … 43 39 namespace WebKit { 44 40 45 class NetworkConnectionToWebProcess; 41 namespace CacheStorage { 46 42 47 class CacheStorageEngine {43 class Engine { 48 44 public: 49 static CacheStorageEngine& from(PAL::SessionID);45 static Engine& from(PAL::SessionID); 50 46 static void destroyEngine(PAL::SessionID); 51 52 enum class Error {53 Internal54 };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>&&)>;70 47 71 48 void open(const String& origin, const String& cacheName, CacheIdentifierCallback&&); … … 78 55 79 56 private: 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(); 88 58 89 59 void writeCachesToDisk(CompletionCallback&&); … … 109 79 }; 110 80 111 } 81 } // namespace CacheStorage 112 82 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 30 30 #include "NetworkConnectionToWebProcess.h" 31 31 #include "WebCacheStorageConnectionMessages.h" 32 #include "WebCoreArgumentCoders.h"33 32 #include <WebCore/CacheQueryOptions.h> 33 34 using namespace WebKit::CacheStorage; 34 35 35 36 namespace WebKit { … … 42 43 void CacheStorageEngineConnection::open(PAL::SessionID sessionID, uint64_t requestIdentifier, const String& origin, const String& cacheName) 43 44 { 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) { 45 46 m_connection.connection().send(Messages::WebCacheStorageConnection::OpenCompleted(requestIdentifier, result), sessionID.sessionID()); 46 47 }); … … 49 50 void CacheStorageEngineConnection::remove(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier) 50 51 { 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) { 52 53 m_connection.connection().send(Messages::WebCacheStorageConnection::RemoveCompleted(requestIdentifier, result), sessionID.sessionID()); 53 54 }); … … 56 57 void CacheStorageEngineConnection::caches(PAL::SessionID sessionID, uint64_t requestIdentifier, const String& origin) 57 58 { 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) { 59 60 m_connection.connection().send(Messages::WebCacheStorageConnection::UpdateCaches(requestIdentifier, result), sessionID.sessionID()); 60 61 }); … … 63 64 void CacheStorageEngineConnection::records(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier) 64 65 { 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) { 66 67 m_connection.connection().send(Messages::WebCacheStorageConnection::UpdateRecords(requestIdentifier, result), sessionID.sessionID()); 67 68 }); … … 70 71 void CacheStorageEngineConnection::deleteMatchingRecords(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier, WebCore::ResourceRequest&& request, WebCore::CacheQueryOptions&& options) 71 72 { 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) { 73 74 m_connection.connection().send(Messages::WebCacheStorageConnection::DeleteRecordsCompleted(requestIdentifier, result), sessionID.sessionID()); 74 75 }); … … 77 78 void CacheStorageEngineConnection::putRecords(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier, Vector<WebCore::CacheStorageConnection::Record>&& records) 78 79 { 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) { 80 81 m_connection.connection().send(Messages::WebCacheStorageConnection::PutRecordsCompleted(requestIdentifier, result), sessionID.sessionID()); 81 82 }); -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r220977 r221093 907 907 41DC459F1E3DBDA500B11F51 /* WebRTCSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F31E3BFE7F001AE678 /* WebRTCSocket.h */; }; 908 908 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 */; }; 909 911 41FAF5F51E3C0649001AE678 /* WebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F41E3C0641001AE678 /* WebRTCResolver.h */; }; 910 912 41FAF5F81E3C1021001AE678 /* LibWebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F61E3C0B47001AE678 /* LibWebRTCResolver.h */; }; … … 1035 1037 517A530F1F47A86200DCDC0A /* WebSWClientConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A530E1F47A84300DCDC0A /* WebSWClientConnectionMessageReceiver.cpp */; }; 1036 1038 517A53101F47A86200DCDC0A /* WebSWClientConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A530D1F47A84300DCDC0A /* WebSWClientConnectionMessages.h */; }; 1039 517CF0E3163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp */; }; 1037 1040 517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; }; 1038 517CF0E3163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950D /* WebCacheStorageConnectionMessageReceiver.cpp */; };1039 1041 517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */; }; 1040 1042 517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; }; … … 3178 3180 41DC459D1E3DBCF000B11F51 /* WebRTCSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebRTCSocket.cpp; path = Network/webrtc/WebRTCSocket.cpp; sourceTree = "<group>"; }; 3179 3181 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>"; }; 3180 3184 41FAF5F31E3BFE7F001AE678 /* WebRTCSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebRTCSocket.h; path = Network/webrtc/WebRTCSocket.h; sourceTree = "<group>"; }; 3181 3185 41FAF5F41E3C0641001AE678 /* WebRTCResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebRTCResolver.h; path = Network/webrtc/WebRTCResolver.h; sourceTree = "<group>"; }; … … 3320 3324 517A530D1F47A84300DCDC0A /* WebSWClientConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSWClientConnectionMessages.h; sourceTree = "<group>"; }; 3321 3325 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>"; }; 3322 3327 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>"; };3324 3328 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStorageEngineConnectionMessageReceiver.cpp; sourceTree = "<group>"; }; 3325 3329 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkProcessConnectionMessages.h; sourceTree = "<group>"; }; … … 8191 8195 isa = PBXGroup; 8192 8196 children = ( 8197 41FABD271F4DDFDC006A6C97 /* CacheStorage.h */, 8193 8198 41897ED61F415D860016FA42 /* CacheStorageEngine.cpp */, 8194 8199 41897ED21F415D850016FA42 /* CacheStorageEngine.h */, 8200 41FABD281F4DDFDC006A6C97 /* CacheStorageEngineCache.h */, 8195 8201 41897ED31F415D850016FA42 /* CacheStorageEngineConnection.cpp */, 8196 8202 41897ED41F415D850016FA42 /* CacheStorageEngineConnection.h */, … … 8425 8431 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, 8426 8432 BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, 8433 41FABD291F4DE001006A6C97 /* CacheStorage.h in Headers */, 8427 8434 41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */, 8435 41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */, 8428 8436 41897EDA1F415D8A0016FA42 /* CacheStorageEngineConnection.h in Headers */, 8429 8437 1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */, -
trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
r220917 r221093 34 34 #include "WebProcess.h" 35 35 #include <wtf/MainThread.h> 36 37 using namespace WebKit::CacheStorage; 36 38 37 39 namespace WebKit { … … 83 85 } 84 86 85 void WebCacheStorageConnection::openCompleted(uint64_t requestIdentifier, Cache StorageEngine::CacheIdentifierOrError&& result)87 void WebCacheStorageConnection::openCompleted(uint64_t requestIdentifier, CacheIdentifierOrError&& result) 86 88 { 87 89 CacheStorageConnection::openCompleted(requestIdentifier, result.hasValue() ? result.value() : 0, !result.hasValue() ? Error::Internal : Error::None); 88 90 } 89 91 90 void WebCacheStorageConnection::removeCompleted(uint64_t requestIdentifier, Cache StorageEngine::CacheIdentifierOrError&& result)92 void WebCacheStorageConnection::removeCompleted(uint64_t requestIdentifier, CacheIdentifierOrError&& result) 91 93 { 92 94 CacheStorageConnection::removeCompleted(requestIdentifier, result.hasValue() ? result.value() : 0, !result.hasValue() ? Error::Internal : Error::None); 93 95 } 94 96 95 void WebCacheStorageConnection::updateCaches(uint64_t requestIdentifier, Cache StorageEngine::CacheInfosOrError&& result)97 void WebCacheStorageConnection::updateCaches(uint64_t requestIdentifier, CacheInfosOrError&& result) 96 98 { 97 99 CacheStorageConnection::updateCaches(requestIdentifier, result.hasValue() ? result.value() : Vector<CacheInfo>()); 98 100 } 99 101 100 void WebCacheStorageConnection::updateRecords(uint64_t requestIdentifier, CacheStorageEngine::RecordsOrError&& result)102 void WebCacheStorageConnection::updateRecords(uint64_t requestIdentifier, RecordsOrError&& result) 101 103 { 102 104 CacheStorageConnection::updateRecords(requestIdentifier, result.hasValue() ? WTFMove(result.value()) : Vector<Record>()); 103 105 } 104 106 105 void WebCacheStorageConnection::deleteRecordsCompleted(uint64_t requestIdentifier, CacheStorageEngine::RecordIdentifiersOrError&& result)107 void WebCacheStorageConnection::deleteRecordsCompleted(uint64_t requestIdentifier, RecordIdentifiersOrError&& result) 106 108 { 107 109 CacheStorageConnection::deleteRecordsCompleted(requestIdentifier, result.hasValue() ? result.value() : Vector<uint64_t>(), !result.hasValue() ? Error::Internal : Error::None); 108 110 } 109 111 110 void WebCacheStorageConnection::putRecordsCompleted(uint64_t requestIdentifier, CacheStorageEngine::RecordIdentifiersOrError&& result)112 void WebCacheStorageConnection::putRecordsCompleted(uint64_t requestIdentifier, RecordIdentifiersOrError&& result) 111 113 { 112 114 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 26 26 #pragma once 27 27 28 #include "CacheStorage Engine.h"28 #include "CacheStorage.h" 29 29 #include <WebCore/CacheStorageConnection.h> 30 30 #include <wtf/HashMap.h> 31 31 32 32 namespace IPC { 33 class Connection; 33 34 class Decoder; 34 35 class Encoder; … … 61 62 void doBatchPutOperation(uint64_t requestIdentifier, uint64_t cacheIdentifier, Vector<Record>&&) final; 62 63 63 void openCompleted(uint64_t requestIdentifier, CacheStorage Engine::CacheIdentifierOrError&&);64 void removeCompleted(uint64_t requestIdentifier, CacheStorage Engine::CacheIdentifierOrError&&);65 void updateCaches(uint64_t requestIdentifier, CacheStorage Engine::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&&); 66 67 67 void updateRecords(uint64_t requestIdentifier, CacheStorage Engine::RecordsOrError&&);68 void deleteRecordsCompleted(uint64_t requestIdentifier, CacheStorage Engine::RecordIdentifiersOrError&&);69 void putRecordsCompleted(uint64_t requestIdentifier, CacheStorage Engine::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&&); 70 71 71 72 WebCacheStorageProvider& m_provider; -
trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.messages.in
r220917 r221093 22 22 23 23 messages -> WebCacheStorageConnection { 24 OpenCompleted(uint64_t requestIdentifier, WebKit::CacheStorage Engine::CacheIdentifierOrError result);25 RemoveCompleted(uint64_t requestIdentifier, WebKit::CacheStorage Engine::CacheIdentifierOrError result);26 UpdateCaches(uint64_t requestIdentifier, WebKit::CacheStorage Engine::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); 27 27 28 UpdateRecords(uint64_t requestIdentifier, WebKit::CacheStorage Engine::RecordsOrError result);29 DeleteRecordsCompleted(uint64_t requestIdentifier, WebKit::CacheStorage Engine::RecordIdentifiersOrError result);30 PutRecordsCompleted(uint64_t requestIdentifier, WebKit::CacheStorage Engine::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); 31 31 }
Note: See TracChangeset
for help on using the changeset viewer.