summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-10-28 12:16:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-28 12:16:34 -0700
commit3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857 (patch)
tree9cf0c16472e9a07e9f173e97749d766d59cfabf6
parent75fd6068b065c26beb1ce4d86090aaacbe243c22 (diff)
parent5dc5e868b07ac990590a394e14a022f16b4ec388 (diff)
downloadexternal_webkit-3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857.zip
external_webkit-3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857.tar.gz
external_webkit-3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857.tar.bz2
Merge "Don't discardQueue if the upload type didn't change" into ics-mr1
-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);