From 81ec1fafcb2c1bc433ec34b6ae4ea78d1ea7d3a8 Mon Sep 17 00:00:00 2001 From: Nicolas Roard Date: Thu, 10 Feb 2011 17:05:41 -0800 Subject: Fix ANR in the browser Sometimes we were not releasing textures as they were busy; they could still be deleted when swapping the layers trees, and as they were also still present in the LayerTexture Hashmap this was causing an ANR (at best -- the texture was already deallocated, the LayerTexture dtor was then trying to release() them...) bug:3398660 Change-Id: I2747dd4630a2a7dc18eae4c5fde36fd14c461747 --- WebCore/platform/graphics/android/GLWebViewState.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'WebCore/platform/graphics/android/GLWebViewState.cpp') diff --git a/WebCore/platform/graphics/android/GLWebViewState.cpp b/WebCore/platform/graphics/android/GLWebViewState.cpp index 38b747d..5ba094b 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -108,9 +108,9 @@ void GLWebViewState::setBaseLayer(BaseLayerAndroid* layer, const IntRect& rect) // We only update the layers if we are not currently // waiting for a tiledPage to be painted if (m_baseLayerUpdate) { + layer->safeRef(); m_currentBaseLayer->safeUnref(); m_currentBaseLayer = layer; - m_currentBaseLayer->safeRef(); } inval(rect); } @@ -118,9 +118,9 @@ void GLWebViewState::setBaseLayer(BaseLayerAndroid* layer, const IntRect& rect) void GLWebViewState::unlockBaseLayerUpdate() { m_baseLayerUpdate = true; android::Mutex::Autolock lock(m_baseLayerLock); + m_baseLayer->safeRef(); m_currentBaseLayer->safeUnref(); m_currentBaseLayer = m_baseLayer; - m_currentBaseLayer->safeRef(); inval(m_invalidateRect); IntRect empty; m_invalidateRect = empty; @@ -295,6 +295,19 @@ void GLWebViewState::setViewport(SkRect& viewport, float scale) m_tiledPageB->updateBaseTileSize(); } +bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, float scale, SkColor color) +{ + m_baseLayerLock.lock(); + BaseLayerAndroid* baseLayer = m_currentBaseLayer; + baseLayer->safeRef(); + m_baseLayerLock.unlock(); + if (!baseLayer) + return false; + bool ret = baseLayer->drawGL(rect, viewport, scale, color); + baseLayer->safeUnref(); + return ret; +} + } // namespace WebCore #endif // USE(ACCELERATED_COMPOSITING) -- cgit v1.1