Changeset 41425 in webkit

Timestamp:

Mar 4, 2009 10:25:50 AM (15 years ago)

Author:

beidson@apple.com

Message:

2009-03-04 Brady Eidson <​beidson@apple.com>

Reviewed by Darin Adler

<rdar://problem/6619630> Quick Look of vCards stuck on image of first card opened.

I narrowed this down to ​http://trac.webkit.org/changeset/39304 which, among other things,
consolidated some of the various decision making pieces of the Cache into the new method
FrameLoader::cachePolicy().

Before 39304, when deciding whether to use an existing CachedResource, we checked if the FrameLoader
is reloading. If it is, we'd evict any existing resource then recreate it. Quick looks uses the
same URL for this image every time and expects it to be reloaded with each new card.

The FrameLoader::isReloading() check did one thing - Ask the DocumentLoader if it's cache policy
is "ReloadIgnoringCacheData". This check was lost in the consolidation to the new method.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::cachePolicy): Restore the DocumentLoader's cachePolicy check as a possible condition for returning CachePolicyReload.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-04  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin Adler
+
+        <rdar://problem/6619630> Quick Look of vCards stuck on image of first card opened.
+
+        I narrowed this down to http://trac.webkit.org/changeset/39304 which, among other things,
+        consolidated some of the various decision making pieces of the Cache into the new method
+        FrameLoader::cachePolicy().
+
+        Before 39304, when deciding whether to use an existing CachedResource, we checked if the FrameLoader 
+        is reloading.  If it is, we'd evict any existing resource then recreate it.  Quick looks uses the
+        same URL for this image every time and expects it to be reloaded with each new card.
+
+        The FrameLoader::isReloading() check did one thing - Ask the DocumentLoader if it's cache policy
+        is "ReloadIgnoringCacheData".  This check was lost in the consolidation to the new method.  
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::cachePolicy): Restore the DocumentLoader's cachePolicy check as a possible
+          condition for returning CachePolicyReload.
+
 2009-03-04  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -3238 +3238 @@
         return CachePolicyVerify;
     
-    if (m_loadType == FrameLoadTypeReloadFromOrigin)
+    if (m_loadType == FrameLoadTypeReloadFromOrigin || documentLoader()->request().cachePolicy() == ReloadIgnoringCacheData)
         return CachePolicyReload;