diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-18 10:15:17 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-18 10:24:18 -0700 |
| commit | d2339fb5509a885ab17100ead6b3a543e7d4d7f7 (patch) | |
| tree | 05f0ec48dc6c562c6abc944f1fedbea0416ba850 /Source | |
| parent | c9efa1bf37f8bbf12a5b5dd465cbfb06c8053d9c (diff) | |
| download | external_webkit-d2339fb5509a885ab17100ead6b3a543e7d4d7f7.zip external_webkit-d2339fb5509a885ab17100ead6b3a543e7d4d7f7.tar.gz external_webkit-d2339fb5509a885ab17100ead6b3a543e7d4d7f7.tar.bz2 | |
Follow the new rule from framework about EGLContext deletion
bug:6325463
Change-Id: I303e2cf08feec110bd75c95f1de8ebc2e79f3c4c
Diffstat (limited to 'Source')
| -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 215bf43..fc29049 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1057,8 +1057,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(); |