diff options
| author | John Reck <jreck@google.com> | 2011-09-07 14:26:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-07 14:26:50 -0700 |
| commit | 96a891dfb6478f30d5ead90c5741eb578f6cf1e5 (patch) | |
| tree | bd58893e6b96246b011b0288fbb72040377e30e8 | |
| parent | efe456e3824deb639f69f5900990c1de81fa33ab (diff) | |
| parent | 52f5c337d737fdbaa361fc46b3e0aff2bb27cbae (diff) | |
| download | external_webkit-96a891dfb6478f30d5ead90c5741eb578f6cf1e5.zip external_webkit-96a891dfb6478f30d5ead90c5741eb578f6cf1e5.tar.gz external_webkit-96a891dfb6478f30d5ead90c5741eb578f6cf1e5.tar.bz2 | |
Merge "OnTrimMemory plumbing"
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 5cf9953..ebbbc1a 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -75,6 +75,15 @@ #include <wtf/text/AtomicString.h> #include <wtf/text/CString.h> +// Free as much as we possible can +#define TRIM_MEMORY_COMPLETE 80 +// Free a lot (all textures gone) +#define TRIM_MEMORY_MODERATE 60 +// More moderate free (keep bare minimum to restore quickly-ish - possibly clear all textures) +#define TRIM_MEMORY_BACKGROUND 40 +// Moderate free (clear cached tiles, keep visible ones) +#define TRIM_MEMORY_UI_HIDDEN 20 + namespace android { static jfieldID gWebViewField; @@ -2562,6 +2571,10 @@ static jstring nativeGetProperty(JNIEnv *env, jobject obj, jstring key) return 0; } +static void nativeOnTrimMemory(JNIEnv *env, jobject obj, jint level) +{ +} + static void nativeDumpDisplayTree(JNIEnv* env, jobject jwebview, jstring jurl) { #ifdef ANDROID_DUMP_DISPLAY_TREE @@ -2865,6 +2878,8 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeSetProperty }, { "nativeGetProperty", "(Ljava/lang/String;)Ljava/lang/String;", (void*) nativeGetProperty }, + { "nativeOnTrimMemory", "(I)V", + (void*) nativeOnTrimMemory }, }; int registerWebView(JNIEnv* env) |