Changeset 244750 in webkit

Timestamp:

Apr 29, 2019, 1:32:47 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Storage::deleteOldVersions does not need to retain Storage
​https://bugs.webkit.org/show_bug.cgi?id=197336
<rdar://problem/48679972>

Reviewed by Darin Adler.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::deleteOldVersions):
Something is wrong with the lifetime of Storage, but we only need a String, not the whole Storage.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-29  Alex Christensen  <achristensen@webkit.org>
+
+        Storage::deleteOldVersions does not need to retain Storage
+        https://bugs.webkit.org/show_bug.cgi?id=197336
+        <rdar://problem/48679972>
+
+        Reviewed by Darin Adler.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::deleteOldVersions):
+        Something is wrong with the lifetime of Storage, but we only need a String, not the whole Storage.
+
 2019-04-29  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -1110 +1110 @@
 void Storage::deleteOldVersions()
 {
-    backgroundIOQueue().dispatch([this, protectedThis = makeRef(*this)] () mutable {
-        auto cachePath = basePath();
-        traverseDirectory(cachePath, [&cachePath](const String& subdirName, DirectoryEntryType type) {
+    backgroundIOQueue().dispatch([cachePath = basePath()] () mutable {
+        traverseDirectory(cachePath, [cachePath = WTFMove(cachePath)](const String& subdirName, DirectoryEntryType type) {
             if (type != DirectoryEntryType::Directory)
                 return;