summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-10-27 17:17:20 -0700
committerJohn Reck <jreck@google.com>2011-10-27 17:17:20 -0700
commit5dc5e868b07ac990590a394e14a022f16b4ec388 (patch)
tree2aa3a339fea3b261a4131d82487aed16785aa5ab /Source/WebCore/platform
parent4476ae7e9e02e5c2ff8a776f01d3fb50e8a4c895 (diff)
downloadexternal_webkit-5dc5e868b07ac990590a394e14a022f16b4ec388.zip
external_webkit-5dc5e868b07ac990590a394e14a022f16b4ec388.tar.gz
external_webkit-5dc5e868b07ac990590a394e14a022f16b4ec388.tar.bz2
Don't discardQueue if the upload type didn't change
Bug: 5529012 Change-Id: I0b57c4cf9d295524f675f2cb7504d5a9c0363871
Diffstat (limited to 'Source/WebCore/platform')
-rw-r--r--Source/WebCore/platform/graphics/android/TransferQueue.cpp3
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);