From: Mike Reed <reed@google.com>
Date: Mon, 27 Apr 2009 15:41:25 +0000 (-0400)
Subject: Move imagecache into android_runtime from browser
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=21afc171e6a91d82acfe777acd1531d0105e458d;p=android-x86%2Fexternal-webkit.git

Move imagecache into android_runtime from browser

Now that Java is also using ashmem and globalpool for images, move the management
of the globalpool budget into android_runtime
---

diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index eefeea513..5c9df979b 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -44,14 +44,9 @@
 
 #include <jni.h>
 #include <JNIHelp.h>
-#include <SkImageRef_GlobalPool.h>
 #include <SkUtils.h>
 #include <utils/misc.h>
 
-// maximum bytes used to cache decoded images
-// (not including big images using ashmem)
-#define IMAGE_POOL_BUDGET   (512 * 1024)
-
 namespace android {
 
 // ----------------------------------------------------------------------------
@@ -263,8 +258,6 @@ void JavaBridge::SharedTimerFired(JNIEnv* env, jobject)
 void JavaBridge::SetCacheSize(JNIEnv* env, jobject obj, jint bytes)
 {
     WebCore::cache()->setCapacities(0, bytes/2, bytes);
-    SkImageRef_GlobalPool::SetRAMBudget(IMAGE_POOL_BUDGET);
-    LOGV("--- set ImageRef budget %d\n", SkImageRef_GlobalPool::GetRAMBudget());
 }
 
 void JavaBridge::SetNetworkOnLine(JNIEnv* env, jobject obj, jboolean online)