diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-08-08 15:57:28 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2011-08-08 16:01:53 -0700 |
| commit | 78fdfbadbd9b4ba76a2a021f85b98bc2b098b8ea (patch) | |
| tree | e04a0bb7af8fc55dfddbe3ec44ae6ee9f3331da0 /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | ea4557db7014fad3d9cf9af2b3f55377826ec725 (diff) | |
| download | external_webkit-78fdfbadbd9b4ba76a2a021f85b98bc2b098b8ea.zip external_webkit-78fdfbadbd9b4ba76a2a021f85b98bc2b098b8ea.tar.gz external_webkit-78fdfbadbd9b4ba76a2a021f85b98bc2b098b8ea.tar.bz2 | |
Fix ANR in webkit
bug:5128336
Change-Id: I591882eb9bd96a04fd34299a8bf76d35a9462d94
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 4155461..748c5e9 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -554,10 +554,8 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, // the BaseTiles' texture. TilesManager::instance()->transferQueue()->updateDirtyBaseTiles(); - if (compositedRoot != m_previouslyUsedRoot) { + if (compositedRoot != m_previouslyUsedRoot) TilesManager::instance()->swapLayersTextures(m_previouslyUsedRoot, compositedRoot); - TilesManager::instance()->cleanupTilesTextures(); - } bool ret = baseLayer->drawGL(compositedRoot, rect, viewport, webViewRect, titleBarHeight, clip, scale, pagesSwapped, color); |