Bug 1153478 - Part 2: Remove useless assertions. r=roc, a=sledru
authorMats Palmgren <mats@mozilla.com>
Thu, 16 Apr 2015 09:04:19 +0000
changeset 265646 eaf6d0499bb00b1e4b3c8fe4016afb06a834eace
parent 265645 aa1de6662e67a125db8f64a53cadd1200206471b
child 265647 764e9e905bab4ee4b6c95d96fcdcf3c0d5cbb8bd
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, sledru
bugs1153478
milestone39.0a2
Bug 1153478 - Part 2: Remove useless assertions. r=roc, a=sledru
layout/generic/nsContainerFrame.cpp
layout/generic/nsInlineFrame.cpp
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -1617,17 +1617,16 @@ nsContainerFrame::MoveOverflowToChildLis
   return DrainSelfOverflowList() || result;
 }
 
 bool
 nsContainerFrame::DrainSelfOverflowList()
 {
   AutoFrameListPtr overflowFrames(PresContext(), StealOverflowFrames());
   if (overflowFrames) {
-    NS_ASSERTION(mFrames.NotEmpty(), "overflow list w/o frames");
     mFrames.AppendFrames(nullptr, *overflowFrames);
     return true;
   }
   return false;
 }
 
 nsIFrame*
 nsContainerFrame::GetNextInFlowChild(ContinuationTraversingState& aState,
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -503,17 +503,16 @@ nsInlineFrame::AttributeChanged(int32_t 
 }
 
 bool
 nsInlineFrame::DrainSelfOverflowListInternal(DrainFlags aFlags,
                                              nsIFrame* aLineContainer)
 {
   AutoFrameListPtr overflowFrames(PresContext(), StealOverflowFrames());
   if (overflowFrames) {
-    NS_ASSERTION(mFrames.NotEmpty(), "overflow list w/o frames");
     // The frames on our own overflowlist may have been pushed by a
     // previous lazilySetParentPointer Reflow so we need to ensure the
     // correct parent pointer.  This is sometimes skipped by Reflow.
     if (!(aFlags & eDontReparentFrames)) {
       nsIFrame* firstChild = overflowFrames->FirstChild();
       if (aLineContainer && aLineContainer->GetPrevContinuation()) {
         ReparentFloatsForInlineChild(aLineContainer, firstChild, true);
       }
@@ -1195,18 +1194,16 @@ nsFirstLineFrame::PullOverflowsFromPrevI
   }
 }
 
 /* virtual */ bool
 nsFirstLineFrame::DrainSelfOverflowList()
 {
   AutoFrameListPtr overflowFrames(PresContext(), StealOverflowFrames());
   if (overflowFrames) {
-    NS_ASSERTION(mFrames.NotEmpty(), "overflow list w/o frames");
-
     bool result = !overflowFrames->IsEmpty();
     const nsFrameList::Slice& newFrames =
       mFrames.AppendFrames(nullptr, *overflowFrames);
     ReparentChildListStyle(PresContext(), newFrames, this);
     return result;
   }
   return false;
 }