Changeset 53737 in webkit

Timestamp:

Jan 22, 2010 4:43:37 PM (14 years ago)

Author:

mjs@apple.com

Message:

2010-01-22 Maciej Stachowiak <​mjs@apple.com>

Reviewed by Adam Roben.

Use stale cache data when going back and forward but not using WebCore’s page cache
​https://bugs.webkit.org/show_bug.cgi?id=33993
<rdar://problem/7383392>

No tests since this is a performance change.

• loader/CachePolicy.h: (WebCore::): Add CachePolicyAllowStale.
• loader/DocLoader.cpp: (WebCore::DocLoader::checkForReload): Never reload in the case of CachePolicyAllowStale.
• loader/FrameLoader.cpp: (WebCore::FrameLoader::subresourceCachePolicy): Return CachePolicyAllowStale if the main resource is being loaded to allow stale data. (WebCore::FrameLoader::addExtraFieldsToRequest): Use ReturnCacheDataElseLoad on back/forward loads - needed when going back of forward to a page with frames.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/CachePolicy.h (modified) (1 diff)
• loader/DocLoader.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-22  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Use stale cache data when going back and forward but not using WebCore’s page cache
+        https://bugs.webkit.org/show_bug.cgi?id=33993
+        <rdar://problem/7383392>
+
+        No tests since this is a performance change.
+
+        * loader/CachePolicy.h:
+        (WebCore::): Add CachePolicyAllowStale.
+        * loader/DocLoader.cpp:
+        (WebCore::DocLoader::checkForReload): Never reload in the case of
+        CachePolicyAllowStale.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::subresourceCachePolicy): Return CachePolicyAllowStale
+        if the main resource is being loaded to allow stale data.
+        (WebCore::FrameLoader::addExtraFieldsToRequest): Use ReturnCacheDataElseLoad
+        on back/forward loads - needed when going back of forward to a page with frames.
+
 2010-01-22  Kelly Norton  <knorton@google.com>
 

trunk/WebCore/loader/CachePolicy.h

@@ -33 +33 @@
         CachePolicyVerify,
         CachePolicyRevalidate,
-        CachePolicyReload
+        CachePolicyReload,
+        CachePolicyAllowStale
     };
 

trunk/WebCore/loader/DocLoader.cpp

@@ -112 +112 @@
         cache()->revalidateResource(existing, this);
         break;
-    default:
-        ASSERT_NOT_REACHED();
+    case CachePolicyAllowStale:
+        return;
     }
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2903 +2903 @@
         return CachePolicyRevalidate;
 
+    if (request.cachePolicy() == ReturnCacheDataElseLoad)
+        return CachePolicyAllowStale;
+
     return CachePolicyVerify;
 }
@@ -3220 +3223 @@
         request.setHTTPHeaderField("Cache-Control", "no-cache");
         request.setHTTPHeaderField("Pragma", "no-cache");
-    }
+    } else if (isBackForwardLoadType(loadType) && !request.url().protocolIs("https"))
+        request.setCachePolicy(ReturnCacheDataElseLoad);
     
     if (mainResource)