Changeset 93326 in webkit

Timestamp:

Aug 18, 2011 11:41:28 AM (13 years ago)

Author:

simonjam@chromium.org

Message:

Revalidate expired resources if they're requested after the initial document load
​https://bugs.webkit.org/show_bug.cgi?id=52153

Reviewed by Antti Koivisto.

Source/WebCore:

Test: http/tests/cache/subresource-multiple-instances.html

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::determineRevalidationPolicy):

LayoutTests:

• http/tests/cache/subresource-multiple-instances-expected.txt: Added.
• http/tests/cache/subresource-multiple-instances.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/subresource-multiple-instances-expected.txt (added)
• LayoutTests/http/tests/cache/subresource-multiple-instances.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-18  James Simonsen  <simonjam@chromium.org>
+
+        Revalidate expired resources if they're requested after the initial document load
+        https://bugs.webkit.org/show_bug.cgi?id=52153
+
+        Reviewed by Antti Koivisto.
+
+        * http/tests/cache/subresource-multiple-instances-expected.txt: Added.
+        * http/tests/cache/subresource-multiple-instances.html: Added.
+
 2011-08-18  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-18  James Simonsen  <simonjam@chromium.org>
+
+        Revalidate expired resources if they're requested after the initial document load
+        https://bugs.webkit.org/show_bug.cgi?id=52153
+
+        Reviewed by Antti Koivisto.
+
+        Test: http/tests/cache/subresource-multiple-instances.html
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::determineRevalidationPolicy):
+
 2011-08-18  Anders Carlsson  <andersca@apple.com>
 

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

@@ -475 +475 @@
     }
 
-    // Avoid loading the same resource multiple times for a single document, even if the cache policies would tell us to.
-    if (m_validatedURLs.contains(existingResource->url()))
+    // During the initial load, avoid loading the same resource multiple times for a single document, even if the cache policies would tell us to.
+    if (!document()->loadEventFinished() && m_validatedURLs.contains(existingResource->url()))
         return Use;
-    
+
     // CachePolicyReload always reloads
     if (cachePolicy() == CachePolicyReload) {