Title: [279599] trunk/Source/WebKit
- Revision
- 279599
- Author
- achristen...@apple.com
- Date
- 2021-07-06 11:29:54 -0700 (Tue, 06 Jul 2021)
Log Message
Unreviewed, reverting r279597.
Broke build
Reverted changeset:
"Make Caches::writeRecord and Caches::readRecord more robust"
https://bugs.webkit.org/show_bug.cgi?id=221620
https://commits.webkit.org/r279597
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279598 => 279599)
--- trunk/Source/WebKit/ChangeLog 2021-07-06 17:59:46 UTC (rev 279598)
+++ trunk/Source/WebKit/ChangeLog 2021-07-06 18:29:54 UTC (rev 279599)
@@ -1,5 +1,17 @@
2021-07-06 Alex Christensen <achristen...@webkit.org>
+ Unreviewed, reverting r279597.
+
+ Broke build
+
+ Reverted changeset:
+
+ "Make Caches::writeRecord and Caches::readRecord more robust"
+ https://bugs.webkit.org/show_bug.cgi?id=221620
+ https://commits.webkit.org/r279597
+
+2021-07-06 Alex Christensen <achristen...@webkit.org>
+
Make Caches::writeRecord and Caches::readRecord more robust
https://bugs.webkit.org/show_bug.cgi?id=221620
Modified: trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp (279598 => 279599)
--- trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp 2021-07-06 17:59:46 UTC (rev 279598)
+++ trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp 2021-07-06 18:29:54 UTC (rev 279599)
@@ -549,9 +549,6 @@
return;
}
- if (!m_storage)
- return callback(WTF::nullopt);
-
m_storage->store(Cache::encode(recordInformation, record), { }, [this, protectedThis = makeRef(*this), protectedStorage = makeRef(*m_storage), callback = WTFMove(callback)](int error) mutable {
if (error) {
RELEASE_LOG_ERROR(CacheStorage, "Caches::writeRecord failed with error %d", error);
@@ -574,9 +571,6 @@
return callback(makeUnexpected(Error::Internal));
}
- if (!m_storage)
- return callback(makeUnexpected(Error::Internal));
-
m_storage->retrieve(key, 4, [protectedStorage = makeRef(*m_storage), callback = WTFMove(callback)](std::unique_ptr<Storage::Record> storage, const Storage::Timings&) mutable {
if (!storage) {
RELEASE_LOG_ERROR(CacheStorage, "Caches::readRecord failed reading record from disk");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
