Changeset 201539 in webkit

Timestamp:

May 31, 2016, 5:28:25 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Fix assertion after r201447
​https://bugs.webkit.org/show_bug.cgi?id=158244

Patch by Alex Christensen <​achristensen@webkit.org> 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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-31  Alex Christensen  <achristensen@webkit.org>
+
+        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  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -688 +688 @@
 {
     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());