diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-13 11:53:27 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2011-10-13 14:14:24 -0700 |
| commit | 530c83c6351e05a6939ad0b5bc291da073e77b5b (patch) | |
| tree | bfdd3c23f00071e7468536cda64aa59822fecfa8 /Source/WebCore/platform/graphics/android/TransferQueue.cpp | |
| parent | 834299ee1971101446d6f2a422956215b6dd1c06 (diff) | |
| download | external_webkit-530c83c6351e05a6939ad0b5bc291da073e77b5b.zip external_webkit-530c83c6351e05a6939ad0b5bc291da073e77b5b.tar.gz external_webkit-530c83c6351e05a6939ad0b5bc291da073e77b5b.tar.bz2 | |
Fix crash in BaseTileTexture
bug:5453156
simplified m_owner management - ONLY modified on UI thread
Previously deferring clear of m_owner, now set immediately since texture thread
doesn't use need stale owner info
Change-Id: I9b6f7bfd27af44a818d378ff750c0170d8122cfd
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TransferQueue.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TransferQueue.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp index a9d6b9a..3fc1b93 100644 --- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp @@ -361,11 +361,8 @@ void TransferQueue::updateQueueWithBitmap(const TileRenderInfo* renderInfo, // failed placing bitmap in queue, discard tile's texture so it will be // re-enqueued (and repainted) BaseTile* tile = renderInfo->baseTile; - if (tile) { - BaseTileTexture* texture = tile->backTexture(); - if (texture) - texture->releaseAndRemoveFromTile(); - } + if (tile) + tile->backTextureTransferFail(); } } |