diff options
| author | John Reck <jreck@google.com> | 2011-04-07 16:48:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-07 16:48:20 -0700 |
| commit | 25beedece7f56619527dc0bd3cb788b0bd2433a6 (patch) | |
| tree | c85f3a8713caaea62c187fbcd7f0fd40f893db4c | |
| parent | fdc5159b9efbfd6a12be9c5a0ba81a479b0b0fc0 (diff) | |
| parent | 74e0ecaa08d693681bb58899b789e520a7b14281 (diff) | |
| download | external_webkit-25beedece7f56619527dc0bd3cb788b0bd2433a6.zip external_webkit-25beedece7f56619527dc0bd3cb788b0bd2433a6.tar.gz external_webkit-25beedece7f56619527dc0bd3cb788b0bd2433a6.tar.bz2 | |
am 74e0ecaa: am 63f5370e: Fix race condition
* commit '74e0ecaa08d693681bb58899b789e520a7b14281':
Fix race condition
| -rw-r--r-- | WebCore/platform/graphics/android/TilesManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/TilesManager.cpp b/WebCore/platform/graphics/android/TilesManager.cpp index 34d0546..afc53eb 100644 --- a/WebCore/platform/graphics/android/TilesManager.cpp +++ b/WebCore/platform/graphics/android/TilesManager.cpp @@ -148,8 +148,9 @@ void TilesManager::resetTextureUsage(TiledPage* page) android::Mutex::Autolock lock(m_texturesLock); for (unsigned int i = 0; i < m_textures.size(); i++) { BackedDoubleBufferedTexture* texture = m_textures[i]; - if (texture->owner()) { - if (texture->owner()->page() == page) + TextureOwner* owner = texture->owner(); + if (owner) { + if (owner->page() == page) texture->setUsedLevel(-1); } } |