summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/GLWebViewState.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2011-02-10 17:05:41 -0800
committerNicolas Roard <nicolas@android.com>2011-02-10 19:18:53 -0800
commit81ec1fafcb2c1bc433ec34b6ae4ea78d1ea7d3a8 (patch)
tree24a0189562324f344a142c7ea9af31d84b5b2627 /WebCore/platform/graphics/android/GLWebViewState.h
parentc2b6a2ab53dae1fbb596bfbfe520f80960ddc34d (diff)
downloadexternal_webkit-81ec1fafcb2c1bc433ec34b6ae4ea78d1ea7d3a8.zip
external_webkit-81ec1fafcb2c1bc433ec34b6ae4ea78d1ea7d3a8.tar.gz
external_webkit-81ec1fafcb2c1bc433ec34b6ae4ea78d1ea7d3a8.tar.bz2
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
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.h')
-rw-r--r--WebCore/platform/graphics/android/GLWebViewState.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h
index 7fa5e39..2082f2c 100644
--- a/WebCore/platform/graphics/android/GLWebViewState.h
+++ b/WebCore/platform/graphics/android/GLWebViewState.h
@@ -205,6 +205,9 @@ public:
return false;
}
+ bool drawGL(IntRect& rect, SkRect& viewport,
+ float scale, SkColor color = SK_ColorWHITE);
+
private:
void inval(const IntRect& rect); // caller must hold m_baseLayerLock