Bug 1389335 - Only check APZTestDataEnabled when APZPaintLogHelper is created. r?botond draft
authorRyan Hunt <rhunt@eqrion.net>
Mon, 14 Aug 2017 00:48:11 -0400
changeset 645726 e96f885e6bf924faa83ff27b6087a16c28a904cf
parent 620112 d942ef54fdf726840a698d2ddcaf989d2c00edbc
child 725993 a8c8e23526dcda369631ffdd8e999274b914c5d1
push id73854
push userbmo:rhunt@eqrion.net
push dateMon, 14 Aug 2017 04:48:37 +0000
reviewersbotond
bugs1389335
milestone57.0a1
Bug 1389335 - Only check APZTestDataEnabled when APZPaintLogHelper is created. r?botond MozReview-Commit-ID: 50JCZSIcLIn
gfx/layers/apz/testutil/APZTestData.h
--- a/gfx/layers/apz/testutil/APZTestData.h
+++ b/gfx/layers/apz/testutil/APZTestData.h
@@ -81,17 +81,16 @@ private:
   DataStore mPaints;
   DataStore mRepaintRequests;
 
   void LogTestDataImpl(DataStore& aDataStore,
                        SequenceNumber aSequenceNumber,
                        ViewID aScrollId,
                        const std::string& aKey,
                        const std::string& aValue) {
-    MOZ_ASSERT(gfxPrefs::APZTestLoggingEnabled(), "don't call me");
     auto bucketIterator = aDataStore.find(aSequenceNumber);
     if (bucketIterator == aDataStore.end()) {
       MOZ_ASSERT(false, "LogTestDataImpl called with nonexistent sequence number");
       return;
     }
     Bucket& bucket = bucketIterator->second;
     ScrollFrameData& scrollFrameData = bucket[aScrollId];  // create if doesn't exist
     MOZ_ASSERT(scrollFrameData.find(aKey) == scrollFrameData.end()
@@ -100,18 +99,19 @@ private:
   }
 };
 
 // A helper class for logging data for a paint.
 class APZPaintLogHelper {
 public:
   APZPaintLogHelper(APZTestData* aTestData, SequenceNumber aPaintSequenceNumber)
     : mTestData(aTestData),
-      mPaintSequenceNumber(aPaintSequenceNumber)
-  {}
+      mPaintSequenceNumber(aPaintSequenceNumber) {
+    MOZ_ASSERT(gfxPrefs::APZTestLoggingEnabled(), "don't call me");
+  }
 
   template <typename Value>
   void LogTestData(FrameMetrics::ViewID aScrollId,
                    const std::string& aKey,
                    const Value& aValue) const {
     if (mTestData) {  // avoid stringifying if mTestData == nullptr
       LogTestData(aScrollId, aKey, ToString(aValue));
     }