Title: [201539] trunk/Source/WebCore
- Revision
- 201539
- Author
- [email protected]
- Date
- 2016-05-31 17:28:25 -0700 (Tue, 31 May 2016)
Log Message
Fix assertion after r201447
https://bugs.webkit.org/show_bug.cgi?id=158244
Patch by Alex Christensen <[email protected]> on 2016-05-31
Reviewed by Jer Noble.
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::loadResource):
If we are loading media using WebCoreNSURLSession, we could be making a request for a
resource we already have in the memory cache because we are ignoring all caches.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201538 => 201539)
--- trunk/Source/WebCore/ChangeLog 2016-06-01 00:26:57 UTC (rev 201538)
+++ trunk/Source/WebCore/ChangeLog 2016-06-01 00:28:25 UTC (rev 201539)
@@ -1,3 +1,15 @@
+2016-05-31 Alex Christensen <[email protected]>
+
+ Fix assertion after r201447
+ https://bugs.webkit.org/show_bug.cgi?id=158244
+
+ Reviewed by Jer Noble.
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::loadResource):
+ If we are loading media using WebCoreNSURLSession, we could be making a request for a
+ resource we already have in the memory cache because we are ignoring all caches.
+
2016-05-31 Chris Dumez <[email protected]>
Clean up / modernize iOS text autosizing code
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (201538 => 201539)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-06-01 00:26:57 UTC (rev 201538)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-06-01 00:28:25 UTC (rev 201539)
@@ -687,7 +687,7 @@
CachedResourceHandle<CachedResource> CachedResourceLoader::loadResource(CachedResource::Type type, CachedResourceRequest& request)
{
auto& memoryCache = MemoryCache::singleton();
- ASSERT(!memoryCache.resourceForRequest(request.resourceRequest(), sessionID()));
+ ASSERT(!request.allowsCaching() || !memoryCache.resourceForRequest(request.resourceRequest(), sessionID()));
LOG(ResourceLoading, "Loading CachedResource for '%s'.", request.resourceRequest().url().stringCenterEllipsizedToLength().latin1().data());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
