Changeset 150863 in webkit

Timestamp:

May 28, 2013 9:56:08 PM (11 years ago)

Author:

aestes@apple.com

Message:

REGRESSION (r150169): Images from file: URLs display after a delay even though they were preloaded by JavaScript
​https://bugs.webkit.org/show_bug.cgi?id=116906
<rdar://problem/13991927>

Reviewed by Andreas Kling.

Writing a test for this is blocked on ​https://webkit.org/b/116199.

Some WebKit clients use JavaScript to preload images from disk so that
subsequent loads will display immediately from the memory cache. By not
caching non-HTTP sub-resources in memory, we break this common pattern.
This change restricts r150169 to only apply to cached main resources.
Sub-resources will again be cached indefinitely as they were prior to
r150169.

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::freshnessLifetime): If this is a non-HTTP
main resource from a scheme that should not be cached indefinitely,
return 0 for the freshness lifetime. For other non-HTTP cached
resources, return an indefinite freshness lifetime.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-28  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r150169): Images from file: URLs display after a delay even though they were preloaded by JavaScript
+        https://bugs.webkit.org/show_bug.cgi?id=116906
+        <rdar://problem/13991927>
+
+        Reviewed by Andreas Kling.
+
+        Writing a test for this is blocked on https://webkit.org/b/116199.
+
+        Some WebKit clients use JavaScript to preload images from disk so that
+        subsequent loads will display immediately from the memory cache. By not
+        caching non-HTTP sub-resources in memory, we break this common pattern.
+        This change restricts r150169 to only apply to cached main resources.
+        Sub-resources will again be cached indefinitely as they were prior to
+        r150169.
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::freshnessLifetime): If this is a non-HTTP
+        main resource from a scheme that should not be cached indefinitely,
+        return 0 for the freshness lifetime. For other non-HTTP cached
+        resources, return an indefinite freshness lifetime.
+
 2013-05-28  Dean Jackson  <dino@apple.com>
 

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

@@ -416 +416 @@
 double CachedResource::freshnessLifetime() const
 {
-    if (SchemeRegistry::shouldCacheResponsesFromURLSchemeIndefinitely(m_response.url().protocol()))
+    if (!m_response.url().protocolIsInHTTPFamily()) {
+        // Don't cache non-HTTP main resources since we can't check for freshness.
+        // FIXME: We should not cache subresources either, but when we tried this
+        // it caused performance and flakiness issues in our test infrastructure.
+        if (m_type == MainResource && !SchemeRegistry::shouldCacheResponsesFromURLSchemeIndefinitely(m_response.url().protocol()))
+            return 0;
+
         return std::numeric_limits<double>::max();
-
-    // Don't cache other non-HTTP resources since we can't check for freshness.
-    if (!m_response.url().protocolIsInHTTPFamily())
-        return 0;
+    }
 
     // RFC2616 13.2.4