Changeset 81635 in webkit

Timestamp:

Mar 21, 2011 7:32:42 PM (13 years ago)

Author:

Nate Chapin

Message:

2011-03-21 Nate Chapin <Nate Chapin>

Reviewed by Brady Eidson.

Tests for ​https://bugs.webkit.org/show_bug.cgi?id=38690.

• http/tests/cache/post-redirect-get-expected.txt: Added.
• http/tests/cache/post-redirect-get.php: Added.
• http/tests/cache/post-with-cached-subresources-expected.txt: Added.
• http/tests/cache/post-with-cached-subresources.php: Added.
• http/tests/cache/resources/post-image-to-verify.php: Added.

2011-03-21 Nate Chapin <Nate Chapin>

Reviewed by Brady Eidson.

Do not check the DocumentLoader's request cache policy
in determining whether we should force revalidation of a cached
subresource. If the main resource received headers telling it not
to cache, that policy will be propagated to subresources.

The previous behavior is left in behind a flag in Settings, since
QuickLook depends on it.

​https://bugs.webkit.org/show_bug.cgi?id=38690

Tests: http/tests/cache/post-redirect-get.php

http/tests/cache/post-with-cached-subresources.php

• loader/FrameLoader.cpp: (WebCore::FrameLoader::subresourceCachePolicy): (WebCore::FrameLoader::loadPostRequest):
• page/Settings.cpp: (WebCore::Settings::Settings):
• page/Settings.h: (WebCore::Settings::setUseQuickLookResourceCachingQuirks): (WebCore::Settings::useQuickLookResourceCachingQuirks):

2011-03-21 Nate Chapin <Nate Chapin>

Reviewed by Brady Eidson.

Expose a preference to use caching quirks for QuickLook,
and use it if the QuickLook framework is loaded.

​https://bugs.webkit.org/show_bug.cgi?id=38690

• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.mm: (useQuickLookQuirks): (+[WebPreferences initialize]): (-[WebPreferences useQuickLookResourceCachingQuirks]):
• WebView/WebPreferencesPrivate.h:
• WebView/WebView.mm: (-[WebView _preferencesChangedNotification:]):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/post-redirect-get-expected.txt (added)
• LayoutTests/http/tests/cache/post-redirect-get.php (added)
• LayoutTests/http/tests/cache/post-with-cached-subresources-expected.txt (added)
• LayoutTests/http/tests/cache/post-with-cached-subresources.php (added)
• LayoutTests/http/tests/cache/resources/post-image-to-verify.php (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (2 diffs)
• Source/WebCore/page/Settings.cpp (modified) (1 diff)
• Source/WebCore/page/Settings.h (modified) (2 diffs)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferences.mm (modified) (3 diffs)
• Source/WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebView.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-21  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Brady Eidson.
+
+        Tests for https://bugs.webkit.org/show_bug.cgi?id=38690.
+
+        * http/tests/cache/post-redirect-get-expected.txt: Added.
+        * http/tests/cache/post-redirect-get.php: Added.
+        * http/tests/cache/post-with-cached-subresources-expected.txt: Added.
+        * http/tests/cache/post-with-cached-subresources.php: Added.
+        * http/tests/cache/resources/post-image-to-verify.php: Added.
+
 2011-03-21  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-21  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Brady Eidson.
+
+        Do not check the DocumentLoader's request cache policy
+        in determining whether we should force revalidation of a cached
+        subresource. If the main resource received headers telling it not
+        to cache, that policy will be propagated to subresources.
+
+        The previous behavior is left in behind a flag in Settings, since
+        QuickLook depends on it.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38690
+
+        Tests: http/tests/cache/post-redirect-get.php
+               http/tests/cache/post-with-cached-subresources.php
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::subresourceCachePolicy):
+        (WebCore::FrameLoader::loadPostRequest):
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        (WebCore::Settings::setUseQuickLookResourceCachingQuirks):
+        (WebCore::Settings::useQuickLookResourceCachingQuirks):
+
 2011-03-21  Rik Cabanier  <cabanier@adobe.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2351 +2351 @@
     }
 
-    // FIXME: POST documents are always Reloads, but their subresources should still be Revalidate.
-    // If we bring the CachePolicy.h and ResourceRequest cache policy enums in sync with each other and
-    // remember "Revalidate" in ResourceRequests, we can remove this "POST" check and return either "Reload" 
-    // or "Revalidate" if the DocumentLoader was requested with either.
     const ResourceRequest& request(documentLoader()->request());
-    if (request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post"))
+    Settings* settings = m_frame->settings();
+    if (settings && settings->useQuickLookResourceCachingQuirks() && request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post"))
         return CachePolicyRevalidate;
 
@@ -2747 +2744 @@
 {
     RefPtr<FormState> formState = prpFormState;
-
-    // When posting, use the NSURLRequestReloadIgnoringCacheData load flag.
-    // This prevents a potential bug which may cause a page with a form that uses itself
-    // as an action to be returned from the cache without submitting.
-
-    // FIXME: Where's the code that implements what the comment above says?
 
     // Previously when this method was reached, the original FrameLoadRequest had been deconstructed to build a 

trunk/Source/WebCore/page/Settings.cpp

@@ -176 +176 @@
     , m_hyperlinkAuditingEnabled(false)
     , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false)
+    , m_useQuickLookResourceCachingQuirks(false)
     , m_forceCompositingMode(false)
 {

trunk/Source/WebCore/page/Settings.h

@@ -372 +372 @@
         void setCrossOriginCheckInGetMatchedCSSRulesDisabled(bool flag) { m_crossOriginCheckInGetMatchedCSSRulesDisabled = flag; }
         bool crossOriginCheckInGetMatchedCSSRulesDisabled() const { return m_crossOriginCheckInGetMatchedCSSRulesDisabled; }
+        
+        void setUseQuickLookResourceCachingQuirks(bool flag) { m_useQuickLookResourceCachingQuirks = flag; }
+        bool useQuickLookResourceCachingQuirks() const { return m_useQuickLookResourceCachingQuirks; }
 
         void setForceCompositingMode(bool flag) { m_forceCompositingMode = flag; }
@@ -474 +477 @@
         bool m_hyperlinkAuditingEnabled : 1;
         bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
+        bool m_useQuickLookResourceCachingQuirks : 1;
         bool m_forceCompositingMode : 1;
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-03-21  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Brady Eidson.
+
+        Expose a preference to use caching quirks for QuickLook,
+        and use it if the QuickLook framework is loaded.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38690
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (useQuickLookQuirks):
+        (+[WebPreferences initialize]):
+        (-[WebPreferences useQuickLookResourceCachingQuirks]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChangedNotification:]):
+
 2011-03-21  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -106 +106 @@
 #define WebKitMemoryInfoEnabledPreferenceKey @"WebKitMemoryInfoEnabled"
 #define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
+#define WebKitUseQuickLookResourceCachingQuirksPreferenceKey @"WebKitUseQuickLookResourceCachingQuirks"
 
 // These are private both because callers should be using the cover methods and because the

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -135 +135 @@
 
     return cacheModel;
+}
+
+static bool useQuickLookQuirks(void)
+{
+    NSArray* frameworks = [NSBundle allFrameworks];
+                           
+    if (!frameworks)
+        return false;
+
+    for (unsigned int i = 0; i < [frameworks count]; i++) {
+        NSBundle* bundle = [frameworks objectAtIndex: i];
+        const char* bundleID = [[bundle bundleIdentifier] UTF8String];
+        if (bundleID && !strcasecmp(bundleID, "com.apple.QuickLookUIFramework"))
+            return true;
+    }
+    return false;
 }
 
@@ -374 +390 @@
         [NSNumber numberWithBool:YES],  WebKitHyperlinkAuditingEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitUsePreHTML5ParserQuirksKey,
+        [NSNumber numberWithBool:useQuickLookQuirks()], WebKitUseQuickLookResourceCachingQuirksPreferenceKey,
         [NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
         [NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheDefaultOriginQuota,
@@ -1397 +1414 @@
 }
 
+- (BOOL)useQuickLookResourceCachingQuirks
+{
+    return [self _boolValueForKey:WebKitUseQuickLookResourceCachingQuirksPreferenceKey];
+}
+
 - (void)didRemoveFromWebView
 {

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -237 +237 @@
 - (BOOL)usePreHTML5ParserQuirks;
 
+- (BOOL)useQuickLookResourceCachingQuirks;
+
 @end

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1517 +1517 @@
     settings->setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
     settings->setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
+    settings->setUseQuickLookResourceCachingQuirks([preferences useQuickLookResourceCachingQuirks]);
     settings->setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);