summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-04-28 05:17:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-04-28 05:17:37 -0700
commit870c40582102e848fd71f82a9e65e7dbd7b8835c (patch)
tree0c767b9490e03f0c6168726a402d1cf1cc27a555
parentb23d00dd9d5dc957f71ca80d8aa706307a51e2ab (diff)
parent21afc171e6a91d82acfe777acd1531d0105e458d (diff)
downloadexternal_webkit-870c40582102e848fd71f82a9e65e7dbd7b8835c.zip
external_webkit-870c40582102e848fd71f82a9e65e7dbd7b8835c.tar.gz
external_webkit-870c40582102e848fd71f82a9e65e7dbd7b8835c.tar.bz2
Merge change 587 into donut
* changes: Move imagecache into android_runtime from browser
-rw-r--r--WebKit/android/jni/JavaBridge.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index eefeea5..5c9df97 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)