Bug 1398041: Make WipeContainingBlock consistent about reconstructing sync or async. r=bz
authorEmilio Cobos Álvarez <emilio@crisal.io>
Fri, 08 Sep 2017 09:05:35 +0200
changeset 429243 af5f4b6dbf7c2ccb16d020e98a520a30374da437
parent 429242 3c698f2b2eed6e29d6346c798e6234bd5b2696c4
child 429244 8961364199aa772738bd745b58932517ba1e25b2
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs1398041
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1398041: Make WipeContainingBlock consistent about reconstructing sync or async. r=bz MozReview-Commit-ID: 1PL3cqfnarB
layout/base/nsCSSFrameConstructor.cpp
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -12740,20 +12740,16 @@ bool
 nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
                                            nsIFrame* aContainingBlock,
                                            nsIFrame* aFrame,
                                            FrameConstructionItemList& aItems,
                                            bool aIsAppend,
                                            nsIFrame* aPrevSibling,
                                            InsertionKind aInsertionKind)
 {
-  // FIXME(emilio): Use the argument instead of always reconstruct async
-  // (to be landed in a separate bug, see bug 1395719 comment 17).
-  aInsertionKind = InsertionKind::Async;
-
   if (aItems.IsEmpty()) {
     return false;
   }
 
   // Before we go and append the frames, we must check for several
   // special situations.
 
   // Situation #1 is a XUL frame that contains frames that are required