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/BaseTile.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/BaseTile.h')
-rw-r--r-- | WebCore/platform/graphics/android/BaseTile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/BaseTile.h b/WebCore/platform/graphics/android/BaseTile.h index 0527fcd..af7df3a 100644 --- a/WebCore/platform/graphics/android/BaseTile.h +++ b/WebCore/platform/graphics/android/BaseTile.h @@ -90,7 +90,7 @@ public: BackedDoubleBufferedTexture* texture() { return m_texture; } // TextureOwner implementation - virtual void removeTexture(BackedDoubleBufferedTexture* texture); + virtual bool removeTexture(BackedDoubleBufferedTexture* texture); virtual TiledPage* page() { return m_page; } private: |