From 3c6051c2ffd43c845daf631da4c34ce335d1520d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 16 May 2011 15:08:05 +0100 Subject: Merge WebKit at r75993: Fix uses of cache() function WebCore::cache() is renamed to WebCore::memoryCache() See http://trac.webkit.org/changeset/75857 Change-Id: Id102b534c784191461a4d077058e5c25d5741d57 --- Source/WebKit/android/jni/JavaBridge.cpp | 2 +- Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/WebKit/android/jni/JavaBridge.cpp b/Source/WebKit/android/jni/JavaBridge.cpp index 2fa12fc..92778ef 100644 --- a/Source/WebKit/android/jni/JavaBridge.cpp +++ b/Source/WebKit/android/jni/JavaBridge.cpp @@ -364,7 +364,7 @@ void JavaBridge::SharedTimerFired(JNIEnv* env, jobject) void JavaBridge::SetCacheSize(JNIEnv* env, jobject obj, jint bytes) { - WebCore::cache()->setCapacities(0, bytes/2, bytes); + WebCore::memoryCache()->setCapacities(0, bytes/2, bytes); } void JavaBridge::SetNetworkOnLine(JNIEnv* env, jobject obj, jboolean online) diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 15b6d20..1ba5934 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1778,7 +1778,7 @@ static void SetCacheDisabled(JNIEnv *env, jobject obj, jboolean disabled) #ifdef ANDROID_INSTRUMENT TimeCounterAuto counter(TimeCounter::NativeCallbackTimeCounter); #endif - WebCore::cache()->setDisabled(disabled); + WebCore::memoryCache()->setDisabled(disabled); } static jboolean CacheDisabled(JNIEnv *env, jobject obj) @@ -1786,16 +1786,16 @@ static jboolean CacheDisabled(JNIEnv *env, jobject obj) #ifdef ANDROID_INSTRUMENT TimeCounterAuto counter(TimeCounter::NativeCallbackTimeCounter); #endif - return WebCore::cache()->disabled(); + return WebCore::memoryCache()->disabled(); } static void ClearWebCoreCache() { - if (!WebCore::cache()->disabled()) { + if (!WebCore::memoryCache()->disabled()) { // Disabling the cache will remove all resources from the cache. They may // still live on if they are referenced by some Web page though. - WebCore::cache()->setDisabled(true); - WebCore::cache()->setDisabled(false); + WebCore::memoryCache()->setDisabled(true); + WebCore::memoryCache()->setDisabled(false); } // clear page cache @@ -1827,7 +1827,7 @@ static void ClearCache(JNIEnv *env, jobject obj) jsHeapStatistics.size, jsHeapStatistics.free); #endif // USE(JSC) LOGD("About to clear cache and current cache has %d bytes live and %d bytes dead", - cache()->getLiveSize(), cache()->getDeadSize()); + memoryCache()->getLiveSize(), memoryCache()->getDeadSize()); #endif // ANDROID_INSTRUMENT ClearWebCoreCache(); ClearWebViewCache(); -- cgit v1.1