OSDN Git Service

Do not merge: Cherry-pick Fix ANR in the browser from master
authorNicolas Roard <nicolas@android.com>
Sat, 19 Feb 2011 09:22:16 +0000 (01:22 -0800)
committerandroid-merger <android-build@android.com>
Tue, 22 Feb 2011 19:40:58 +0000 (11:40 -0800)
commit74279f07b8e8909c798d5715c68b9454a52e7902
tree87a0a6c1e89de2b3a46e8d405e8b2fa976427b85
parente640eea532fdf12e6e5ad2274a0ae62b5fa4e1e7
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/BackedDoubleBufferedTexture.cpp
WebCore/platform/graphics/android/BackedDoubleBufferedTexture.h
WebCore/platform/graphics/android/BaseTile.cpp
WebCore/platform/graphics/android/BaseTile.h
WebCore/platform/graphics/android/GLWebViewState.cpp
WebCore/platform/graphics/android/GLWebViewState.h
WebCore/platform/graphics/android/LayerAndroid.cpp
WebCore/platform/graphics/android/LayerAndroid.h
WebCore/platform/graphics/android/TextureOwner.h
WebKit/android/nav/WebView.cpp