Commit 88f0e02f authored by andersca@apple.com's avatar andersca@apple.com

2008-05-13 Anders Carlsson <andersca@apple.com>

        Reviewed by Sam.

        Don't empty the application cache in _setCacheModel, since it will be called during initialization.
        Instead, do it in [WebCache empty].
        
        * Misc/WebCache.mm:
        (+[WebCache empty]):
        * WebView/WebView.mm:
        (+[WebView _setCacheModel:]):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@33423 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6bdff067
2008-05-13 Anders Carlsson <andersca@apple.com>
Reviewed by Sam.
Don't empty the application cache in _setCacheModel, since it will be called during initialization.
Instead, do it in [WebCache empty].
* Misc/WebCache.mm:
(+[WebCache empty]):
* WebView/WebView.mm:
(+[WebView _setCacheModel:]):
2008-05-13 chris fleizach <cfleizach@apple.com> 2008-05-13 chris fleizach <cfleizach@apple.com>
Reviewed by Beth Dakin Reviewed by Beth Dakin
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#import "WebPreferences.h" #import "WebPreferences.h"
#import "WebView.h" #import "WebView.h"
#import "WebViewInternal.h" #import "WebViewInternal.h"
#import <WebCore/ApplicationCacheStorage.h>
#import <WebCore/Cache.h> #import <WebCore/Cache.h>
@implementation WebCache @implementation WebCache
...@@ -70,6 +71,9 @@ ...@@ -70,6 +71,9 @@
WebCacheModel cacheModel = [WebView _cacheModel]; WebCacheModel cacheModel = [WebView _cacheModel];
[WebView _setCacheModel:WebCacheModelDocumentViewer]; [WebView _setCacheModel:WebCacheModelDocumentViewer];
[WebView _setCacheModel:cacheModel]; [WebView _setCacheModel:cacheModel];
// Empty the application cache.
WebCore::cacheStorage().empty();
} }
+ (void)setDisabled:(BOOL)disabled + (void)setDisabled:(BOOL)disabled
......
...@@ -4066,9 +4066,6 @@ static WebFrameView *containingFrameView(NSView *view) ...@@ -4066,9 +4066,6 @@ static WebFrameView *containingFrameView(NSView *view)
[nsurlCache setMemoryCapacity:nsurlCacheMemoryCapacity]; [nsurlCache setMemoryCapacity:nsurlCacheMemoryCapacity];
[nsurlCache setDiskCapacity:nsurlCacheDiskCapacity]; [nsurlCache setDiskCapacity:nsurlCacheDiskCapacity];
// Empty the application cache.
cacheStorage().empty();
s_cacheModel = cacheModel; s_cacheModel = cacheModel;
s_didSetCacheModel = YES; s_didSetCacheModel = YES;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment