Title: [241663] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 241663
- Author
- carlo...@webkit.org
- Date
- 2019-02-18 08:11:56 -0800 (Mon, 18 Feb 2019)
Log Message
Merge r241544 - Do not add a caches to its engine if the salt cannot be initialized
https://bugs.webkit.org/show_bug.cgi?id=194604
Reviewed by Antti Koivisto.
This is a follow-up to https://bugs.webkit.org/show_bug.cgi?id=194588.
We should return early if initialize fails.
* NetworkProcess/cache/CacheStorageEngine.cpp:
(WebKit::CacheStorage::Engine::readCachesFromDisk):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (241662 => 241663)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-18 11:17:35 UTC (rev 241662)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-18 16:11:56 UTC (rev 241663)
@@ -1,3 +1,16 @@
+2019-02-14 Youenn Fablet <you...@apple.com>
+
+ Do not add a caches to its engine if the salt cannot be initialized
+ https://bugs.webkit.org/show_bug.cgi?id=194604
+
+ Reviewed by Antti Koivisto.
+
+ This is a follow-up to https://bugs.webkit.org/show_bug.cgi?id=194588.
+ We should return early if initialize fails.
+
+ * NetworkProcess/cache/CacheStorageEngine.cpp:
+ (WebKit::CacheStorage::Engine::readCachesFromDisk):
+
2019-02-14 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.23.90 release
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp (241662 => 241663)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2019-02-18 11:17:35 UTC (rev 241662)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2019-02-18 16:11:56 UTC (rev 241663)
@@ -310,6 +310,11 @@
void Engine::readCachesFromDisk(const WebCore::ClientOrigin& origin, CachesCallback&& callback)
{
initialize([this, origin, callback = WTFMove(callback)](Optional<Error>&& error) mutable {
+ if (error) {
+ callback(makeUnexpected(error.value()));
+ return;
+ }
+
auto& caches = m_caches.ensure(origin, [&origin, this] {
auto path = cachesRootPath(origin);
return Caches::create(*this, WebCore::ClientOrigin { origin }, WTFMove(path), m_quota);
@@ -320,11 +325,6 @@
return;
}
- if (error) {
- callback(makeUnexpected(error.value()));
- return;
- }
-
caches->initialize([callback = WTFMove(callback), caches = caches.copyRef()](Optional<Error>&& error) mutable {
if (error) {
callback(makeUnexpected(error.value()));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
