diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-02-27 17:22:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-27 17:22:13 -0800 |
| commit | 55fce40b4f3cdc9f93daba59d8ff9c311de4b9c0 (patch) | |
| tree | 7b80ad83d1bfcf1c91017cb8a653045303ddea42 /Source/WebKit/android/nav | |
| parent | 6753735b5cf1b2396d387b9f876a11a5fd2b3c3d (diff) | |
| parent | 886eb87d34570b706a0f17fa944d98870ed6a2af (diff) | |
| download | external_webkit-55fce40b4f3cdc9f93daba59d8ff9c311de4b9c0.zip external_webkit-55fce40b4f3cdc9f93daba59d8ff9c311de4b9c0.tar.gz external_webkit-55fce40b4f3cdc9f93daba59d8ff9c311de4b9c0.tar.bz2 | |
Merge "Gl resource should be re-initialized after EGL context changed"
Diffstat (limited to 'Source/WebKit/android/nav')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 162d6bd..3abdd26 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -2151,8 +2151,10 @@ 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. if (level >= TRIM_MEMORY_MODERATE - && !TilesManager::instance()->highEndGfx()) + && !TilesManager::instance()->highEndGfx()) { TilesManager::instance()->transferQueue()->emptyQueue(); + TilesManager::instance()->setContextChanged(true); + } bool freeAllTextures = (level > TRIM_MEMORY_UI_HIDDEN), glTextures = true; TilesManager::instance()->discardTextures(freeAllTextures, glTextures); |