From 634f229e4f0075b052e110ba0a89554c46f6c510 Mon Sep 17 00:00:00 2001 From: Nicolas Roard Date: Sat, 19 Feb 2011 01:22:16 -0800 Subject: Do not merge: Cherry-pick Fix ANR in the browser from master 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: I3b08af94a6a7041d45d373ebaec0ec4ba59dac82 --- WebCore/platform/graphics/android/GLWebViewState.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'WebCore/platform/graphics/android/GLWebViewState.h') diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h index d45340d..4b71d86 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.h +++ b/WebCore/platform/graphics/android/GLWebViewState.h @@ -208,6 +208,9 @@ public: void setBackgroundColor(SkColor color) { m_backgroundColor = color; } SkColor getBackgroundColor() { return m_backgroundColor; } + bool drawGL(IntRect& rect, SkRect& viewport, + float scale, SkColor color = SK_ColorWHITE); + private: void inval(const IntRect& rect); // caller must hold m_baseLayerLock -- cgit v1.1