diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-03-22 13:54:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 13:54:35 -0700 |
| commit | 3c0646dfb15435c0b0283cd329b97f61c951bb8d (patch) | |
| tree | 17d40e93d6b8d6d741d91112418e5e7443b0e038 /WebCore | |
| parent | e821a69c55620f90f900dfd48f557e1aeba0d2db (diff) | |
| parent | 176fb0a1767db036303ab2df17d9e889b5e88db0 (diff) | |
| download | external_webkit-3c0646dfb15435c0b0283cd329b97f61c951bb8d.zip external_webkit-3c0646dfb15435c0b0283cd329b97f61c951bb8d.tar.gz external_webkit-3c0646dfb15435c0b0283cd329b97f61c951bb8d.tar.bz2 | |
am 176fb0a1: am 50e0a1d1: Fix a browser ANR
* commit '176fb0a1767db036303ab2df17d9e889b5e88db0':
Fix a browser ANR
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp b/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp index f68050f..63c9806 100644 --- a/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp +++ b/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp @@ -191,8 +191,13 @@ void BackedDoubleBufferedTexture::producerUpdate(TextureInfo* textureInfo) bool BackedDoubleBufferedTexture::acquire(TextureOwner* owner) { - if (m_owner == owner) + if (m_owner == owner) { + if (m_delayedRelease) { + m_delayedRelease = false; + m_delayedReleaseOwner = 0; + } return true; + } return setOwner(owner); } |