Diff
Modified: trunk/Source/WebCore/ChangeLog (87328 => 87329)
--- trunk/Source/WebCore/ChangeLog 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebCore/ChangeLog 2011-05-25 23:00:45 UTC (rev 87329)
@@ -1,3 +1,25 @@
+2011-05-25 Stephanie Lewis <sle...@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.no...@apple.com>
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (87328 => 87329)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-05-25 23:00:45 UTC (rev 87329)
@@ -2407,15 +2407,16 @@
if (parentCachePolicy != CachePolicyVerify)
return parentCachePolicy;
}
+
+ if (m_loadType == FrameLoadTypeReload)
+ return CachePolicyRevalidate;
const ResourceRequest& request(documentLoader()->request());
- Settings* settings = m_frame->settings();
- if (settings && settings->useQuickLookResourceCachingQuirks() && request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post"))
+#if PLATFORM(MAC)
+ if (request.cachePolicy() == ReloadIgnoringCacheData && !equalIgnoringCase(request.httpMethod(), "post") && ResourceRequest::useQuickLookResourceCachingQuirks())
return CachePolicyRevalidate;
+#endif
- if (m_loadType == FrameLoadTypeReload)
- return CachePolicyRevalidate;
-
if (request.cachePolicy() == ReturnCacheDataElseLoad)
return CachePolicyHistoryBuffer;
Modified: trunk/Source/WebCore/page/Settings.cpp (87328 => 87329)
--- trunk/Source/WebCore/page/Settings.cpp 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-05-25 23:00:45 UTC (rev 87329)
@@ -177,7 +177,6 @@
, m_usePreHTML5ParserQuirks(false)
, m_hyperlinkAuditingEnabled(false)
, m_crossOriginCheckInGetMatchedCSSRulesDisabled(false)
- , m_useQuickLookResourceCachingQuirks(false)
, m_forceCompositingMode(false)
, m_shouldInjectUserScriptsInInitialEmptyDocument(false)
, m_allowDisplayOfInsecureContent(true)
Modified: trunk/Source/WebCore/page/Settings.h (87328 => 87329)
--- trunk/Source/WebCore/page/Settings.h 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebCore/page/Settings.h 2011-05-25 23:00:45 UTC (rev 87329)
@@ -394,9 +394,6 @@
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; }
bool forceCompositingMode() { return m_forceCompositingMode; }
@@ -509,7 +506,6 @@
bool m_usePreHTML5ParserQuirks: 1;
bool m_hyperlinkAuditingEnabled : 1;
bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
- bool m_useQuickLookResourceCachingQuirks : 1;
bool m_forceCompositingMode : 1;
bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1;
bool m_allowDisplayOfInsecureContent : 1;
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (87328 => 87329)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2011-05-25 23:00:45 UTC (rev 87329)
@@ -91,6 +91,10 @@
static bool httpPipeliningEnabled();
static void setHTTPPipeliningEnabled(bool);
+#if PLATFORM(MAC)
+ static bool useQuickLookResourceCachingQuirks();
+#endif
+
private:
friend class ResourceRequestBase;
Modified: trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm (87328 => 87329)
--- trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2011-05-25 23:00:45 UTC (rev 87329)
@@ -32,6 +32,7 @@
#import "FormDataStreamMac.h"
#import "ResourceRequestCFNet.h"
+#import "RuntimeApplicationChecks.h"
#import "WebCoreSystemInterface.h"
#import <Foundation/Foundation.h>
@@ -174,7 +175,32 @@
}
#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
#endif // !USE(CFNETWORK)
Modified: trunk/Source/WebKit/mac/ChangeLog (87328 => 87329)
--- trunk/Source/WebKit/mac/ChangeLog 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-05-25 23:00:45 UTC (rev 87329)
@@ -1,3 +1,19 @@
+2011-05-25 Stephanie Lewis <sle...@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.no...@apple.com>
Reviewed by Darin Adler.
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (87328 => 87329)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2011-05-25 23:00:45 UTC (rev 87329)
@@ -106,7 +106,6 @@
#define WebKitAsynchronousSpellCheckingEnabledPreferenceKey @"WebKitAsynchronousSpellCheckingEnabled"
#define WebKitMemoryInfoEnabledPreferenceKey @"WebKitMemoryInfoEnabled"
#define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
-#define WebKitUseQuickLookResourceCachingQuirksPreferenceKey @"WebKitUseQuickLookResourceCachingQuirks"
#define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
// These are private both because callers should be using the cover methods and because the
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (87328 => 87329)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2011-05-25 23:00:45 UTC (rev 87329)
@@ -137,22 +137,6 @@
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;
-}
-
@interface WebPreferencesPrivate : NSObject
{
@public
@@ -392,7 +376,6 @@
[NSNumber numberWithBool:YES], WebKitHyperlinkAuditingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitUsePreHTML5ParserQuirksKey,
[NSNumber numberWithBool:YES], WebKitAVFoundationEnabledKey,
- [NSNumber numberWithBool:useQuickLookQuirks()], WebKitUseQuickLookResourceCachingQuirksPreferenceKey,
[NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
[NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheDefaultOriginQuota,
nil];
@@ -1425,11 +1408,6 @@
[self _setBoolValue:flag forKey:WebKitUsePreHTML5ParserQuirksKey];
}
-- (BOOL)useQuickLookResourceCachingQuirks
-{
- return [self _boolValueForKey:WebKitUseQuickLookResourceCachingQuirksPreferenceKey];
-}
-
- (void)didRemoveFromWebView
{
ASSERT(_private->numWebViews);
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (87328 => 87329)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2011-05-25 23:00:45 UTC (rev 87329)
@@ -238,8 +238,6 @@
- (void)setUsePreHTML5ParserQuirks:(BOOL)flag;
- (BOOL)usePreHTML5ParserQuirks;
-- (BOOL)useQuickLookResourceCachingQuirks;
-
- (void)setLoadsSiteIconsIgnoringImageLoadingPreference: (BOOL)flag;
- (BOOL)loadsSiteIconsIgnoringImageLoadingPreference;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (87328 => 87329)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2011-05-25 22:53:23 UTC (rev 87328)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2011-05-25 23:00:45 UTC (rev 87329)
@@ -1572,7 +1572,6 @@
settings->setMemoryInfoEnabled([preferences memoryInfoEnabled]);
settings->setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
settings->setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
- settings->setUseQuickLookResourceCachingQuirks([preferences useQuickLookResourceCachingQuirks]);
settings->setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);
settings->setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
settings->setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
