Bug 1540195 - Call InitAndRestoreFrame to ensure we have the parent setup correctly before calling SetInitialSingleChild. r=TYLin

Differential Revision: https://phabricator.services.mozilla.com/D25430

--HG--
extra : rebase_source : 5028a617be06dc0668edd92ee8410790200ec0ad

layout/base/nsCSSFrameConstructor.cpp

@@ -10766,7 +10766,6 @@ nsContainerFrame* nsCSSFrameConstructor::BeginBuildingColumns(
     nsContainerFrame* columnSetFrame = NS_NewColumnSetFrame(
         mPresShell, aComputedStyle, nsFrameState(NS_FRAME_OWNS_ANON_BOXES));
     InitAndRestoreFrame(aState, aContent, aParentFrame, columnSetFrame);
-    SetInitialSingleChild(columnSetFrame, aColumnContent);
 
     RefPtr<ComputedStyle> anonBlockStyle =
         mPresShell->StyleSet()->ResolveInheritingAnonymousBoxStyle(
@@ -10774,6 +10773,7 @@ nsContainerFrame* nsCSSFrameConstructor::BeginBuildingColumns(
     aColumnContent->SetComputedStyleWithoutNotification(anonBlockStyle);
     InitAndRestoreFrame(aState, aContent, columnSetFrame, aColumnContent);
 
+    SetInitialSingleChild(columnSetFrame, aColumnContent);
     return columnSetFrame;
   }