Show
Ignore:
Timestamp:
08/04/08 12:23:14 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35534

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebKit/mac/WebView/WebView.mm

    r427 r429  
    132132#import <objc/objc-auto.h> 
    133133#import <objc/objc-runtime.h> 
    134 #import <sys/param.h> 
    135134 
    136135#if ENABLE(DASHBOARD_SUPPORT) 
    …… 
    18801879    ASSERT(appName); 
    18811880 
    1882     NSString* cacheDir = nil; 
    1883      
    1884 #ifdef BUILDING_ON_TIGER 
    1885     cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"]; 
    1886 #else 
    1887     char cacheDirectory[MAXPATHLEN]; 
    1888     size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN); 
    1889      
    1890     if (cacheDirectoryLen) 
    1891         cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1]; 
    1892 #endif 
    1893  
    1894     cacheDir = [cacheDir stringByAppendingPathComponent:appName];     
     1881    NSString* cacheDir = [NSString _webkit_applicationCacheDirectoryWithBundleIdentifier:appName]; 
    18951882 
    18961883    cacheStorage().setCacheDirectory(cacheDir);