diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-02-10 19:33:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-10 19:33:59 -0800 |
| commit | f683cf60e404c2664a013ef2d4ffda87c4dfacdf (patch) | |
| tree | b1b5680338ca7f6b9f19848e9556f3264e9a1850 /WebCore/platform/graphics/android/GLWebViewState.h | |
| parent | 246ea84a226462854f9c876c8dd03665271b3f78 (diff) | |
| parent | 81ec1fafcb2c1bc433ec34b6ae4ea78d1ea7d3a8 (diff) | |
| download | external_webkit-f683cf60e404c2664a013ef2d4ffda87c4dfacdf.zip external_webkit-f683cf60e404c2664a013ef2d4ffda87c4dfacdf.tar.gz external_webkit-f683cf60e404c2664a013ef2d4ffda87c4dfacdf.tar.bz2 | |
Merge "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...)"
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.h')
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.h | 3 |
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 |