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/WebCore/platform/graphics/android/GLWebViewState.cpp | |
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/WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 8581a8e..a52a3fe 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -323,10 +323,7 @@ int GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING) ALOGW("WARNING, scale seems corrupted before update: %e", scale); - // Here before we draw, update the Tile which has updated content. - // Inside this function, just do GPU blits from the transfer queue into - // the Tiles' texture. - tilesManager->transferQueue()->updateDirtyTiles(); + tilesManager->updateTilesIfContextVerified(); // Upload any pending ImageTexture // Return true if we still have some images to upload. @@ -366,9 +363,6 @@ int GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, glBindBuffer(GL_ARRAY_BUFFER, 0); - // Clean up GL textures for video layer. - tilesManager->videoLayerManager()->deleteUnusedTextures(); - if (returnFlags & uirenderer::DrawGlInfo::kStatusDraw) { // returnFlags & kStatusDraw && empty inval region means we've inval'd everything, // but don't have new content. Keep redrawing full view (0,0,0,0) |