From fa7ce0a3ae343a2c4f3b39736010debf6ce6f00b Mon Sep 17 00:00:00 2001 From: Botond Ballo Date: Fri, 16 May 2014 16:13:06 -0400 Subject: [PATCH] Bug 1011659 - Remove spammy warnings from APZTestData.h until fixing bug 1007728 makes them non-spammy and meaningful. r=kats --- gfx/layers/apz/testutil/APZTestData.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/gfx/layers/apz/testutil/APZTestData.h b/gfx/layers/apz/testutil/APZTestData.h index b94974effa7..127300b5b72 100644 --- a/gfx/layers/apz/testutil/APZTestData.h +++ b/gfx/layers/apz/testutil/APZTestData.h @@ -42,13 +42,10 @@ class APZTestData { friend class APZTestDataToJSConverter; public: void StartNewPaint(SequenceNumber aSequenceNumber) { - auto insertResult = mPaints.insert(DataStore::value_type(aSequenceNumber, Bucket())); - if (!insertResult.second) { - // TODO(botond): Change this to MOZ_ASSERT once we get rid of - // APZCTreeManager::UpdatePanZoomControllerTree() calls for repeat - // transactions. - NS_WARNING("Already have a paint with this sequence number"); - } + mPaints.insert(DataStore::value_type(aSequenceNumber, Bucket())); + // TODO(botond): MOZ_ASSERT() that we didn't already have a paint with this + // sequence number once we get rid ofAPZCTreeManager::UpdatePanZoomControllerTree() + // calls for repeat transactions (bug 1007728). } void LogTestDataForPaint(SequenceNumber aSequenceNumber, ViewID aScrollId, @@ -96,13 +93,10 @@ private: } Bucket& bucket = bucketIterator->second; ScrollFrameData& scrollFrameData = bucket[aScrollId]; // create if doesn't exist - auto insertResult = scrollFrameData.insert(ScrollFrameData::value_type(aKey, aValue)); - if (!insertResult.second) { - // TODO(botond): Change this to MOZ_ASSERT once we get rid of - // APZCTreeManager::UpdatePanZoomControllerTree() calls for repeat - // transactions. - NS_WARNING("Key already present in test data, not overwriting"); - } + scrollFrameData.insert(ScrollFrameData::value_type(aKey, aValue)); + // TODO(botond): MOZ_ASSERT() that we don't already have this key once we + // get rid of APZCTreeManager::UpdatePanZoomControllerTree() calls for + // repeat transactions (bug 1007728). } };