Reviewed by Mark Rowe.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2007 20:26:39 +0000 (20:26 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2007 20:26:39 +0000 (20:26 +0000)
        Remove a check for early versions of Leopard CFNetwork now that
        Leopard has shipped.

        * Misc/WebKitVersionChecks.h: Remove WEBKIT_FIRST_CFNETWORK_VERSION_WITH_LARGE_DISK_CACHE_FIX.
        * WebView/WebView.mm:
        (+[WebView _setCacheModel:]): Remove the early Leopard CFNetwork check.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28401 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/mac/ChangeLog
WebKit/mac/Misc/WebKitVersionChecks.h
WebKit/mac/WebView/WebView.mm

index d8ff0eb..acca000 100644 (file)
@@ -1,3 +1,14 @@
+2007-12-04  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Remove a check for early versions of Leopard CFNetwork now that
+        Leopard has shipped.
+
+        * Misc/WebKitVersionChecks.h: Remove WEBKIT_FIRST_CFNETWORK_VERSION_WITH_LARGE_DISK_CACHE_FIX.
+        * WebView/WebView.mm:
+        (+[WebView _setCacheModel:]): Remove the early Leopard CFNetwork check.
+
 2007-12-04  Kevin Decker  <kdecker@apple.com>
 
         Reviewed by Darin.
index 40c983b..5b4bd62 100644 (file)
@@ -44,8 +44,6 @@
 #define WEBKIT_FIRST_VERSION_WITH_CACHE_MODEL_API 0x020B0500 // 523.5.0
 #define WEBKIT_FIRST_VERSION_WITHOUT_JAVASCRIPT_RETURN_QUIRK 0x020D0100 // 525.1.0
 
-#define WEBKIT_FIRST_CFNETWORK_VERSION_WITH_LARGE_DISK_CACHE_FIX 0x00D30000 // 211
-
 #ifdef __cplusplus
 extern "C" {
 #endif
index 1e42a30..3c2b9b6 100644 (file)
@@ -3740,12 +3740,7 @@ static WebFrameView *containingFrameView(NSView *view)
 #ifdef BUILDING_ON_TIGER
     // Don't use a big Foundation disk cache on Tiger because, according to the 
     // PLT, the Foundation disk cache on Tiger is slower than the network. 
-    nsurlCacheDiskCapacity = [[NSURLCache sharedURLCache] diskCapacity];
-#else
-    // Don't use a big Foundation disk cache on older versions of Leopard because
-    // doing so causes a SPOD on launch (<rdar://problem/5465260>).
-    if (NSVersionOfRunTimeLibrary("CFNetwork") < WEBKIT_FIRST_CFNETWORK_VERSION_WITH_LARGE_DISK_CACHE_FIX)
-        nsurlCacheDiskCapacity = [[NSURLCache sharedURLCache] diskCapacity];
+    nsurlCacheDiskCapacity = [nsurlCache diskCapacity];
 #endif
 
     // Don't shrink a big disk cache, since that would cause churn.