diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-18 13:03:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-18 13:03:09 -0700 |
| commit | 5d87a47ee7434cc534b9ff046c4f29a34d6b0cea (patch) | |
| tree | 5c745c4feb0c0596808f31dd94d46eb517eacbf8 /Source/WebKit/android/nav | |
| parent | 6230a7a2415e8b40c6d19847bc94a0919f06127b (diff) | |
| parent | d2339fb5509a885ab17100ead6b3a543e7d4d7f7 (diff) | |
| download | external_webkit-5d87a47ee7434cc534b9ff046c4f29a34d6b0cea.zip external_webkit-5d87a47ee7434cc534b9ff046c4f29a34d6b0cea.tar.gz external_webkit-5d87a47ee7434cc534b9ff046c4f29a34d6b0cea.tar.bz2 | |
Merge "Follow the new rule from framework about EGLContext deletion"
Diffstat (limited to 'Source/WebKit/android/nav')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index f444282..d3bc62d 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1059,8 +1059,9 @@ static void nativeOnTrimMemory(JNIEnv *env, jobject obj, jint level) // Texture to avoid ANR b/c framework may destroy the EGL context. // Refer to WindowManagerImpl.java for conditions we followed. TilesManager* tilesManager = TilesManager::instance(); - if (level >= TRIM_MEMORY_MODERATE - && !tilesManager->highEndGfx()) { + if ((level >= TRIM_MEMORY_MODERATE + && !tilesManager->highEndGfx()) + || level >= TRIM_MEMORY_COMPLETE) { ALOGD("OnTrimMemory with EGL Context %p", eglGetCurrentContext()); tilesManager->transferQueue()->emptyQueue(); tilesManager->shader()->cleanupGLResources(); |