Bug 1103106 - Make assertion failure: !mWillChangeBudgetCalculated non fatal. r=benwa
authorGregor Wagner <anygregor@gmail.com>
Fri, 09 Jan 2015 13:29:43 -0800
changeset 236174 0bc29e98ceb40a173c466f7ff9cea3b05883e74a
parent 236173 20a4b3274754273cf81ab7ec3aa373ab190c2063
child 236175 2dcf6d304cd21eb08b9c26085e015b22452fac49
push id391
push usermcmanus@ducksong.com
push dateMon, 12 Jan 2015 18:26:35 +0000
reviewersbenwa
bugs1103106
milestone37.0a1
Bug 1103106 - Make assertion failure: !mWillChangeBudgetCalculated non fatal. r=benwa
layout/base/nsDisplayList.cpp
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1268,18 +1268,18 @@ nsDisplayListBuilder::AdjustWindowDraggi
     }
   }
 }
 
 void
 nsDisplayListBuilder::AddToWillChangeBudget(nsIFrame* aFrame, const nsSize& aRect) {
   // Make sure that we don't query the budget before the display list is fully
   // built and that the will change budget is locked in.
-  MOZ_ASSERT(!mWillChangeBudgetCalculated,
-             "Can't modify the budget once it's been used.");
+  NS_ASSERTION(!mWillChangeBudgetCalculated,
+               "Can't modify the budget once it's been used.");
 
   DocumentWillChangeBudget budget;
 
   nsPresContext* key = aFrame->PresContext();
   if (mWillChangeBudget.Contains(key)) {
     mWillChangeBudget.Get(key, &budget);
   }
 
@@ -1299,18 +1299,18 @@ nsDisplayListBuilder::AddToWillChangeBud
 bool
 nsDisplayListBuilder::IsInWillChangeBudget(nsIFrame* aFrame) const {
   uint32_t multiplier = 3;
 
   mWillChangeBudgetCalculated = true;
 
   nsPresContext* key = aFrame->PresContext();
   if (!mWillChangeBudget.Contains(key)) {
-    MOZ_ASSERT(false, "If we added nothing to our budget then this "
-                      "shouldn't be called.");
+    NS_ASSERTION(false, "If we added nothing to our budget then this "
+                        "shouldn't be called.");
     return false;
   }
 
   DocumentWillChangeBudget budget;
   mWillChangeBudget.Get(key, &budget);
 
   nsRect area = aFrame->PresContext()->GetVisibleArea();
   uint32_t budgetLimit = nsPresContext::AppUnitsToIntCSSPixels(area.width) *