diff options
author | win7-7 <win7-7@users.noreply.github.com> | 2020-05-08 00:46:35 +0300 |
---|---|---|
committer | win7-7 <win7-7@users.noreply.github.com> | 2020-05-08 15:22:22 +0300 |
commit | 130df5da4ff47d546f8e2eecd7c388b78a587930 (patch) | |
tree | 0c78dd35bcd56cade438e1a65f33f06a19fbf342 /layout/generic | |
parent | f102e7f80d5d7c972e7619c3f9efe7460918c6d4 (diff) | |
download | UXP-130df5da4ff47d546f8e2eecd7c388b78a587930.tar UXP-130df5da4ff47d546f8e2eecd7c388b78a587930.tar.gz UXP-130df5da4ff47d546f8e2eecd7c388b78a587930.tar.lz UXP-130df5da4ff47d546f8e2eecd7c388b78a587930.tar.xz UXP-130df5da4ff47d546f8e2eecd7c388b78a587930.zip |
Issue #1355 - Preemptively fix build bustage for 1409114
Diffstat (limited to 'layout/generic')
-rw-r--r-- | layout/generic/nsBlockFrame.cpp | 4 | ||||
-rw-r--r-- | layout/generic/nsFrame.cpp | 4 | ||||
-rw-r--r-- | layout/generic/nsGfxScrollFrame.cpp | 4 | ||||
-rw-r--r-- | layout/generic/nsPageFrame.cpp | 2 | ||||
-rw-r--r-- | layout/generic/nsSubDocumentFrame.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index df8536dcb..4742db07e 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -6554,7 +6554,7 @@ DisplayLine(nsDisplayListBuilder* aBuilder, const nsRect& aLineArea, // Collect our line's display items in a temporary nsDisplayListCollection, // so that we can apply any "text-overflow" clipping to the entire collection // without affecting previous lines. - nsDisplayListCollection collection; + nsDisplayListCollection collection(aBuilder); // Block-level child backgrounds go on the blockBorderBackgrounds list ... // Inline-level child backgrounds go on the regular child content list. @@ -6620,7 +6620,7 @@ nsBlockFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, TextOverflow::WillProcessLines(aBuilder, this)); // We'll collect our lines' display items here, & then append this to aLists. - nsDisplayListCollection linesDisplayListCollection; + nsDisplayListCollection linesDisplayListCollection(aBuilder); // Don't use the line cursor if we might have a descendant placeholder ... // it might skip lines that contain placeholders but don't themselves diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 66f655f65..9ac9abb34 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -2267,7 +2267,7 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder, clipState.EnterStackingContextContents(clearClip); - nsDisplayListCollection set; + nsDisplayListCollection set(aBuilder); { DisplayListClipState::AutoSaveRestore nestedClipState(aBuilder); nsDisplayListBuilder::AutoInTransformSetter @@ -2874,7 +2874,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder, // We allow positioned descendants of the child to escape to our parent // stacking context's positioned descendant list, because they might be // z-index:non-auto - nsDisplayListCollection pseudoStack; + nsDisplayListCollection pseudoStack(aBuilder); aBuilder->AdjustWindowDraggingRegion(child); child->BuildDisplayList(aBuilder, pseudoStack); aBuilder->DisplayCaret(child, pseudoStack.Content()); diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index fea4110c0..dd1b15f77 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -3099,7 +3099,7 @@ ScrollFrameHelper::AppendScrollPartsTo(nsDisplayListBuilder* aBuilder, bool isOverlayScrollbar = (flags != 0) && overlayScrollbars; bool createLayer = aCreateLayer || isOverlayScrollbar; - nsDisplayListCollection partList; + nsDisplayListCollection partList(aBuilder); { nsDisplayListBuilder::AutoBuildingDisplayList buildingForChild(aBuilder, mOuter, @@ -3420,7 +3420,7 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder, nsIScrollableFrame* sf = do_QueryFrame(mOuter); MOZ_ASSERT(sf); - nsDisplayListCollection scrolledContent; + nsDisplayListCollection scrolledContent(aBuilder); { // Note that setting the current scroll parent id here means that positioned children // of this scroll info layer will pick up the scroll info layer as their scroll handoff diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 473d3a21d..31a686e83 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -519,7 +519,7 @@ void nsPageFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsDisplayListSet& aLists) { - nsDisplayListCollection set; + nsDisplayListCollection set(aBuilder); if (PresContext()->IsScreen()) { DisplayBorderBackgroundOutline(aBuilder, aLists); diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp index 215cd5376..fd9a7d32c 100644 --- a/layout/generic/nsSubDocumentFrame.cpp +++ b/layout/generic/nsSubDocumentFrame.cpp @@ -342,7 +342,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, bool pointerEventsNone = StyleUserInterface()->mPointerEvents == NS_STYLE_POINTER_EVENTS_NONE; if (!aBuilder->IsForEventDelivery() || !pointerEventsNone) { - nsDisplayListCollection decorations; + nsDisplayListCollection decorations(aBuilder); DisplayBorderBackgroundOutline(aBuilder, decorations); if (rfp) { // Wrap background colors of <iframe>s with remote subdocuments in their |