Title: [221410] trunk/Source/WebKit
- Revision
- 221410
- Author
- commit-qu...@webkit.org
- Date
- 2017-08-30 17:55:54 -0700 (Wed, 30 Aug 2017)
Log Message
Remove the list of removed caches from CacheStorageEngine
https://bugs.webkit.org/show_bug.cgi?id=176136
Patch by Youenn Fablet <you...@apple.com> on 2017-08-30
Reviewed by Alex Christensen.
This list is no longer useful as CacheStorageEngineCaches handles its own removed caches.
* NetworkProcess/cache/CacheStorageEngine.cpp:
(WebKit::CacheStorage::Engine::remove):
(WebKit::CacheStorage::Engine::cache):
* NetworkProcess/cache/CacheStorageEngine.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (221409 => 221410)
--- trunk/Source/WebKit/ChangeLog 2017-08-31 00:31:21 UTC (rev 221409)
+++ trunk/Source/WebKit/ChangeLog 2017-08-31 00:55:54 UTC (rev 221410)
@@ -1,3 +1,18 @@
+2017-08-30 Youenn Fablet <you...@apple.com>
+
+ Remove the list of removed caches from CacheStorageEngine
+ https://bugs.webkit.org/show_bug.cgi?id=176136
+
+ Reviewed by Alex Christensen.
+
+
+ This list is no longer useful as CacheStorageEngineCaches handles its own removed caches.
+
+ * NetworkProcess/cache/CacheStorageEngine.cpp:
+ (WebKit::CacheStorage::Engine::remove):
+ (WebKit::CacheStorage::Engine::cache):
+ * NetworkProcess/cache/CacheStorageEngine.h:
+
2017-08-30 Tim Horton <timothy_hor...@apple.com>
REGRESSION (r221068): Graphics corruption when dragging images on iOS
Modified: trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp (221409 => 221410)
--- trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2017-08-31 00:31:21 UTC (rev 221409)
+++ trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2017-08-31 00:55:54 UTC (rev 221410)
@@ -108,12 +108,7 @@
}
}
if (!cachesToModify) {
- auto position = m_removedCaches.findMatching([&](const auto& item) { return item.identifier == cacheIdentifier; });
- if (position == notFound) {
- callback(makeUnexpected(Error::Internal));
- return;
- }
- callback(cacheIdentifier);
+ callback(makeUnexpected(Error::Internal));
return;
}
@@ -323,11 +318,6 @@
if ((result = caches->find(cacheIdentifier)))
break;
}
- if (!result) {
- auto position = m_removedCaches.findMatching([&](const auto& item) { return item.identifier == cacheIdentifier; });
- if (position != notFound)
- result = &m_removedCaches[position];
- }
return result;
}
Modified: trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.h (221409 => 221410)
--- trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.h 2017-08-31 00:31:21 UTC (rev 221409)
+++ trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.h 2017-08-31 00:55:54 UTC (rev 221410)
@@ -91,7 +91,6 @@
Cache* cache(uint64_t cacheIdentifier);
HashMap<String, Ref<Caches>> m_caches;
- Vector<Cache> m_removedCaches;
uint64_t m_nextCacheIdentifier { 0 };
String m_rootPath;
RefPtr<WorkQueue> m_ioQueue;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
