diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-19 14:54:31 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-20 09:33:49 -0700 |
| commit | 2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca (patch) | |
| tree | e9a2ec93fffb786b8eccf3f4bdba490c769337e6 /Source/WebKit | |
| parent | 7ad2efca85a989d9ab57e311af605a6fed9c9925 (diff) | |
| download | external_webkit-2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca.zip external_webkit-2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca.tar.gz external_webkit-2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca.tar.bz2 | |
Better handle the EGL context lost situation.
Unless framework provide a better message, we can't avoid this EGL context issue
totally if mis-match happen again.
Clean up some obsolete code.
Change-Id: Ica03daecd58f9757c8cad41e0f40d5d51b041748
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index d3bc62d..fbd0d94 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1063,9 +1063,7 @@ static void nativeOnTrimMemory(JNIEnv *env, jobject obj, jint level) && !tilesManager->highEndGfx()) || level >= TRIM_MEMORY_COMPLETE) { ALOGD("OnTrimMemory with EGL Context %p", eglGetCurrentContext()); - tilesManager->transferQueue()->emptyQueue(); - tilesManager->shader()->cleanupGLResources(); - tilesManager->videoLayerManager()->cleanupGLResources(); + tilesManager->cleanupGLResources(); } bool freeAllTextures = (level > TRIM_MEMORY_UI_HIDDEN), glTextures = true; |