Bug 1340966 Part 2 - Fix assertion in nsBlockFrame::DoReflowInlineFrames(). draft
authorTing-Yu Lin <tlin@mozilla.com>
Fri, 08 Sep 2017 16:20:29 +0800
changeset 662132 d4dc0b022c145c272993c154bf2d88800d625dc2
parent 662131 e2e36214ed6e6ac3e36b7e22f87ad47ac6d8d996
child 662133 3b12516f5cb90630d58b659e3cdd5b979c4061e0
push id78960
push userbmo:tlin@mozilla.com
push dateMon, 11 Sep 2017 03:46:33 +0000
bugs1340966, 523468
milestone57.0a1
Bug 1340966 Part 2 - Fix assertion in nsBlockFrame::DoReflowInlineFrames(). SetNextInFlowNeedsReflow() will also assert on this call site after adding Part 3. These lines removed here were added in bug 523468, but the test case (523468-1.html) added in bug 523468 is no longer assert after applying this patch, so these lines do not seem relevant anymore. MozReview-Commit-ID: DVlR2GPYb9S
layout/generic/nsBlockFrame.cpp
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -4163,19 +4163,16 @@ nsBlockFrame::DoReflowInlineFrames(Block
     if (pushedToOverflowLines) {
       // aLine is stale, it's associated with the main line list but it should
       // be associated with the overflow line list now
       aLine = overflowLines->mLines.begin();
     }
     nsBlockInFlowLineIterator iter(this, aLine, pushedToOverflowLines);
     if (iter.Next() && iter.GetLine()->IsInline()) {
       iter.GetLine()->MarkDirty();
-      if (iter.GetContainer() != this) {
-        aState.mReflowStatus.SetNextInFlowNeedsReflow();
-      }
     }
   }
 
   *aLineReflowStatus = lineReflowStatus;
 }
 
 /**
  * Reflow an inline frame. The reflow status is mapped from the frames