diff options
| author | John Reck <jreck@google.com> | 2011-10-28 22:27:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 22:27:27 +0000 |
| commit | 78bdd5946b724447f53daddbe1209823e6f70fbd (patch) | |
| tree | 407c7bba2e0df22f74fe9c0ca8f681ce49cb0a4d /Source/WebCore/platform/graphics | |
| parent | 55c803ea682f7facace8e4148ad1a12063142a1c (diff) | |
| parent | 3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857 (diff) | |
| download | external_webkit-78bdd5946b724447f53daddbe1209823e6f70fbd.zip external_webkit-78bdd5946b724447f53daddbe1209823e6f70fbd.tar.gz external_webkit-78bdd5946b724447f53daddbe1209823e6f70fbd.tar.bz2 | |
am 3b9a114e: Merge "Don\'t discardQueue if the upload type didn\'t change" into ics-mr1
* commit '3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857':
Don't discardQueue if the upload type didn't change
Diffstat (limited to 'Source/WebCore/platform/graphics')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TransferQueue.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp index 4e29870..5c4f0f3 100644 --- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp @@ -470,6 +470,9 @@ void TransferQueue::addItemInTransferQueue(const TileRenderInfo* renderInfo, void TransferQueue::setTextureUploadType(TextureUploadType type) { + if (m_currentUploadType == type) + return; + discardQueue(); android::Mutex::Autolock lock(m_transferQueueItemLocks); |