From 78fdfbadbd9b4ba76a2a021f85b98bc2b098b8ea Mon Sep 17 00:00:00 2001 From: Nicolas Roard Date: Mon, 8 Aug 2011 15:57:28 -0700 Subject: Fix ANR in webkit bug:5128336 Change-Id: I591882eb9bd96a04fd34299a8bf76d35a9462d94 --- Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp') 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); -- cgit v1.1