Changeset 87329 in webkit

Timestamp:

May 25, 2011 4:00:45 PM (13 years ago)

Author:

Stephanie Lewis

Message:

Source/WebCore: ​https://bugs.webkit.org/show_bug.cgi?id=61407
part of <rdar://problem/8675177>
Move Quicklook quirk down into WebCore so it can be caculated when the user
starts a reload. Restructure the conditions so it only called when absolutely
necessary.

Reviewed by Brady Eidson.

No change in functionality so no new tests.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::subresourceCachePolicy):

• page/Settings.cpp:

(WebCore::Settings::Settings):

• page/Settings.h:
• platform/network/cf/ResourceRequest.h:
• platform/network/mac/ResourceRequestMac.mm:

(WebCore::initQuickLookResourceCachingQuirks):
(WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):

Source/WebKit/mac: ​https://bugs.webkit.org/show_bug.cgi?id=61407
part of <rdar://problem/8675177>
Remove Quicklook pref. Moving it enirely down into WebCore so it can
be calculated only on reloads.

Reviewed by Brady Eidson.

• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):

• WebView/WebPreferencesPrivate.h:
• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (1 diff)
• WebCore/page/Settings.h (modified) (2 diffs)
• WebCore/platform/network/cf/ResourceRequest.h (modified) (1 diff)
• WebCore/platform/network/mac/ResourceRequestMac.mm (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebPreferences.mm (modified) (3 diffs)
• WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-25  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=61407
+        part of <rdar://problem/8675177>
+        Move Quicklook quirk down into WebCore so it can be caculated when the user
+        starts a reload.  Restructure the conditions so it only called when absolutely 
+        necessary.
+  
+        No change in functionality so no new tests.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::subresourceCachePolicy):
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        * platform/network/cf/ResourceRequest.h:
+        * platform/network/mac/ResourceRequestMac.mm:
+        (WebCore::initQuickLookResourceCachingQuirks):
+        (WebCore::ResourceRequest::useQuickLookResourceCachingQuirks):
+
 2011-05-24  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2408 +2408 @@
             return parentCachePolicy;
     }
-
-    const ResourceRequest& request(documentLoader()->request());
-    Settings* settings = m_frame->settings();
-    if (settings && settings->useQuickLookResourceCachingQuirks() && request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post"))
-        return CachePolicyRevalidate;
-
+    
     if (m_loadType == FrameLoadTypeReload)
         return CachePolicyRevalidate;
+
+    const ResourceRequest& request(documentLoader()->request());
+#if PLATFORM(MAC)
+    if (request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post") && ResourceRequest::useQuickLookResourceCachingQuirks())
+        return CachePolicyRevalidate;
+#endif
 
     if (request.cachePolicy() == ReturnCacheDataElseLoad)

trunk/Source/WebCore/page/Settings.cpp

@@ -178 +178 @@
     , m_hyperlinkAuditingEnabled(false)
     , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false)
-    , m_useQuickLookResourceCachingQuirks(false)
     , m_forceCompositingMode(false)
     , m_shouldInjectUserScriptsInInitialEmptyDocument(false)

trunk/Source/WebCore/page/Settings.h

@@ -395 +395 @@
         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; }
         bool forceCompositingMode() { return m_forceCompositingMode; }
@@ -510 +507 @@
         bool m_hyperlinkAuditingEnabled : 1;
         bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
-        bool m_useQuickLookResourceCachingQuirks : 1;
         bool m_forceCompositingMode : 1;
         bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1;

trunk/Source/WebCore/platform/network/cf/ResourceRequest.h

@@ -92 +92 @@
         static void setHTTPPipeliningEnabled(bool);
 
+#if PLATFORM(MAC)
+        static bool useQuickLookResourceCachingQuirks();
+#endif
+
     private:
         friend class ResourceRequestBase;

trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm

@@ -33 +33 @@
 #import "FormDataStreamMac.h"
 #import "ResourceRequestCFNet.h"
+#import "RuntimeApplicationChecks.h"
 #import "WebCoreSystemInterface.h"
 
@@ -175 +176 @@
 
 #endif
+    
+static bool initQuickLookResourceCachingQuirks()
+{
+    if (applicationIsSafari())
+        return false;
+    
+    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;
+}
+
+bool ResourceRequest::useQuickLookResourceCachingQuirks()
+{
+    static bool flag = initQuickLookResourceCachingQuirks();
+    return flag;
+}
 
 } // namespace WebCore

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-05-25  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=61407
+        part of <rdar://problem/8675177>
+        Remove Quicklook pref.  Moving it enirely down into WebCore so it can
+        be calculated only on reloads.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2011-05-24  Jer Noble  <jer.noble@apple.com>
 

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

@@ -107 +107 @@
 #define WebKitMemoryInfoEnabledPreferenceKey @"WebKitMemoryInfoEnabled"
 #define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
-#define WebKitUseQuickLookResourceCachingQuirksPreferenceKey @"WebKitUseQuickLookResourceCachingQuirks"
 #define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
 

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

@@ -136 +136 @@
 
     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;
 }
 
@@ -393 +377 @@
         [NSNumber numberWithBool:NO],   WebKitUsePreHTML5ParserQuirksKey,
         [NSNumber numberWithBool:YES],  WebKitAVFoundationEnabledKey,
-        [NSNumber numberWithBool:useQuickLookQuirks()], WebKitUseQuickLookResourceCachingQuirksPreferenceKey,
         [NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
         [NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheDefaultOriginQuota,
@@ -1426 +1409 @@
 }
 
-- (BOOL)useQuickLookResourceCachingQuirks
-{
-    return [self _boolValueForKey:WebKitUseQuickLookResourceCachingQuirksPreferenceKey];
-}
-
 - (void)didRemoveFromWebView
 {

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

@@ -239 +239 @@
 - (BOOL)usePreHTML5ParserQuirks;
 
-- (BOOL)useQuickLookResourceCachingQuirks;
-
 - (void)setLoadsSiteIconsIgnoringImageLoadingPreference: (BOOL)flag;
 - (BOOL)loadsSiteIconsIgnoringImageLoadingPreference;

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

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