wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-30 04:17:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1355 - Preemptively fix build bustage for 1409114

Browse source
This commit is contained in:
win7-7 2020-05-08 00:46:35 +03:00 • committed by Roy Tam
commit e15b1ba0ec
15 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
layout/base/nsDisplayList.h
View file

@ -2288,12 +2288,13 @@ protected:
* to the object, and all distinct. * to the object, and all distinct.
*/ */
struct nsDisplayListCollection : public nsDisplayListSet { struct nsDisplayListCollection : public nsDisplayListSet {
nsDisplayListCollection() : explicit nsDisplayListCollection(nsDisplayListBuilder* aBuilder)
nsDisplayListSet(&mLists[0], &mLists[1], &mLists[2], &mLists[3], &mLists[4], : nsDisplayListSet(&mLists[0], &mLists[1], &mLists[2], &mLists[3], &mLists[4],
&mLists[5]) {}
explicit nsDisplayListCollection(nsDisplayList* aBorderBackground) :
nsDisplayListSet(aBorderBackground, &mLists[1], &mLists[2], &mLists[3], &mLists[4],
&mLists[5]) {} &mLists[5]) {}
explicit nsDisplayListCollection(nsDisplayListBuilder* aBuilder,
nsDisplayList* aBorderBackground)
: nsDisplayListSet(aBorderBackground, &mLists[1], &mLists[2], &mLists[3], &mLists[4],
&mLists[5]) {}
/** /**
* Sort all lists by content order. * Sort all lists by content order.

2
layout/forms/nsComboboxControlFrame.cpp
View file

@ -1339,7 +1339,7 @@ void
nsComboboxDisplayFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, nsComboboxDisplayFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsDisplayListSet& aLists) const nsDisplayListSet& aLists)
{ {
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
nsBlockFrame::BuildDisplayList(aBuilder, set); nsBlockFrame::BuildDisplayList(aBuilder, set);
// remove background items if parent frame is themed // remove background items if parent frame is themed

2
layout/forms/nsFieldSetFrame.cpp
View file

@ -182,7 +182,7 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
DisplayOverflowContainers(aBuilder, aLists); DisplayOverflowContainers(aBuilder, aLists);
} }
nsDisplayListCollection contentDisplayItems; nsDisplayListCollection contentDisplayItems(aBuilder);
if (nsIFrame* inner = GetInner()) { if (nsIFrame* inner = GetInner()) {
// Collect the inner frame's display items into their own collection. // Collect the inner frame's display items into their own collection.
// We need to be calling BuildDisplayList on it before the legend in // We need to be calling BuildDisplayList on it before the legend in

2
layout/forms/nsHTMLButtonControlFrame.cpp
View file

@ -116,7 +116,7 @@ nsHTMLButtonControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
mRenderer.DisplayButton(aBuilder, aLists.BorderBackground(), &onTop); mRenderer.DisplayButton(aBuilder, aLists.BorderBackground(), &onTop);
} }
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
// Do not allow the child subtree to receive events. // Do not allow the child subtree to receive events.
if (!isForEventDelivery) { if (!isForEventDelivery) {

2
layout/forms/nsSelectsAreaFrame.cpp
View file

@ -133,7 +133,7 @@ nsSelectsAreaFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
return; return;
} }
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
BuildDisplayListInternal(aBuilder, set); BuildDisplayListInternal(aBuilder, set);
nsOptionEventGrabberWrapper wrapper; nsOptionEventGrabberWrapper wrapper;

4
layout/generic/nsBlockFrame.cpp
View file

@ -6554,7 +6554,7 @@ DisplayLine(nsDisplayListBuilder* aBuilder, const nsRect& aLineArea,
// Collect our line's display items in a temporary nsDisplayListCollection, // Collect our line's display items in a temporary nsDisplayListCollection,
// so that we can apply any "text-overflow" clipping to the entire collection // so that we can apply any "text-overflow" clipping to the entire collection
// without affecting previous lines. // without affecting previous lines.
nsDisplayListCollection collection; nsDisplayListCollection collection(aBuilder);
// Block-level child backgrounds go on the blockBorderBackgrounds list ... // Block-level child backgrounds go on the blockBorderBackgrounds list ...
// Inline-level child backgrounds go on the regular child content list. // Inline-level child backgrounds go on the regular child content list.
@ -6620,7 +6620,7 @@ nsBlockFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
TextOverflow::WillProcessLines(aBuilder, this)); TextOverflow::WillProcessLines(aBuilder, this));
// We'll collect our lines' display items here, & then append this to aLists. // 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 ... // Don't use the line cursor if we might have a descendant placeholder ...
// it might skip lines that contain placeholders but don't themselves // it might skip lines that contain placeholders but don't themselves

4
layout/generic/nsFrame.cpp
View file

@ -2267,7 +2267,7 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
clipState.EnterStackingContextContents(clearClip); clipState.EnterStackingContextContents(clearClip);
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
{ {
DisplayListClipState::AutoSaveRestore nestedClipState(aBuilder); DisplayListClipState::AutoSaveRestore nestedClipState(aBuilder);
nsDisplayListBuilder::AutoInTransformSetter nsDisplayListBuilder::AutoInTransformSetter
@ -2874,7 +2874,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
// We allow positioned descendants of the child to escape to our parent // We allow positioned descendants of the child to escape to our parent
// stacking context's positioned descendant list, because they might be // stacking context's positioned descendant list, because they might be
// z-index:non-auto // z-index:non-auto
nsDisplayListCollection pseudoStack; nsDisplayListCollection pseudoStack(aBuilder);
aBuilder->AdjustWindowDraggingRegion(child); aBuilder->AdjustWindowDraggingRegion(child);
child->BuildDisplayList(aBuilder, pseudoStack); child->BuildDisplayList(aBuilder, pseudoStack);
aBuilder->DisplayCaret(child, pseudoStack.Content()); aBuilder->DisplayCaret(child, pseudoStack.Content());

4
layout/generic/nsGfxScrollFrame.cpp
View file

@ -3099,7 +3099,7 @@ ScrollFrameHelper::AppendScrollPartsTo(nsDisplayListBuilder* aBuilder,
bool isOverlayScrollbar = (flags != 0) && overlayScrollbars; bool isOverlayScrollbar = (flags != 0) && overlayScrollbars;
bool createLayer = aCreateLayer || isOverlayScrollbar; bool createLayer = aCreateLayer || isOverlayScrollbar;
nsDisplayListCollection partList; nsDisplayListCollection partList(aBuilder);
{ {
nsDisplayListBuilder::AutoBuildingDisplayList nsDisplayListBuilder::AutoBuildingDisplayList
buildingForChild(aBuilder, mOuter, buildingForChild(aBuilder, mOuter,
@ -3420,7 +3420,7 @@ ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
nsIScrollableFrame* sf = do_QueryFrame(mOuter); nsIScrollableFrame* sf = do_QueryFrame(mOuter);
MOZ_ASSERT(sf); MOZ_ASSERT(sf);
nsDisplayListCollection scrolledContent; nsDisplayListCollection scrolledContent(aBuilder);
{ {
// Note that setting the current scroll parent id here means that positioned children // 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 // of this scroll info layer will pick up the scroll info layer as their scroll handoff

2
layout/generic/nsPageFrame.cpp
View file

@ -519,7 +519,7 @@ void
nsPageFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, nsPageFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsDisplayListSet& aLists) const nsDisplayListSet& aLists)
{ {
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
if (PresContext()->IsScreen()) { if (PresContext()->IsScreen()) {
DisplayBorderBackgroundOutline(aBuilder, aLists); DisplayBorderBackgroundOutline(aBuilder, aLists);

2
layout/generic/nsSubDocumentFrame.cpp
View file

@ -342,7 +342,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
bool pointerEventsNone = bool pointerEventsNone =
StyleUserInterface()->mPointerEvents == NS_STYLE_POINTER_EVENTS_NONE; StyleUserInterface()->mPointerEvents == NS_STYLE_POINTER_EVENTS_NONE;
if (!aBuilder->IsForEventDelivery() || !pointerEventsNone) { if (!aBuilder->IsForEventDelivery() || !pointerEventsNone) {
nsDisplayListCollection decorations; nsDisplayListCollection decorations(aBuilder);
DisplayBorderBackgroundOutline(aBuilder, decorations); DisplayBorderBackgroundOutline(aBuilder, decorations);
if (rfp) { if (rfp) {
// Wrap background colors of <iframe>s with remote subdocuments in their // Wrap background colors of <iframe>s with remote subdocuments in their

2
layout/tables/nsTableWrapperFrame.cpp
View file

@ -180,7 +180,7 @@ nsTableWrapperFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
return; return;
} }
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
BuildDisplayListForInnerTable(aBuilder, set); BuildDisplayListForInnerTable(aBuilder, set);
nsDisplayListSet captionSet(set, set.BlockBorderBackgrounds()); nsDisplayListSet captionSet(set, set.BlockBorderBackgrounds());

2
layout/xul/nsBoxFrame.cpp
View file

@ -1328,7 +1328,7 @@ nsBoxFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
} }
} }
nsDisplayListCollection tempLists; nsDisplayListCollection tempLists(aBuilder);
const nsDisplayListSet& destination = forceLayer ? tempLists : aLists; const nsDisplayListSet& destination = forceLayer ? tempLists : aLists;
DisplayBorderBackgroundOutline(aBuilder, destination); DisplayBorderBackgroundOutline(aBuilder, destination);

2
layout/xul/nsMenuFrame.cpp
View file

@ -364,7 +364,7 @@ nsMenuFrame::BuildDisplayListForChildren(nsDisplayListBuilder* aBuilder,
return; return;
} }
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
nsBoxFrame::BuildDisplayListForChildren(aBuilder, set); nsBoxFrame::BuildDisplayListForChildren(aBuilder, set);
WrapListsInRedirector(aBuilder, set, aLists); WrapListsInRedirector(aBuilder, set, aLists);

2
layout/xul/nsSliderFrame.cpp
View file

@ -358,7 +358,7 @@ nsSliderFrame::BuildDisplayListForChildren(nsDisplayListBuilder* aBuilder,
nsLayoutUtils::SetScrollbarThumbLayerization(thumb, thumbGetsLayer); nsLayoutUtils::SetScrollbarThumbLayerization(thumb, thumbGetsLayer);
if (thumbGetsLayer) { if (thumbGetsLayer) {
nsDisplayListCollection tempLists; nsDisplayListCollection tempLists(aBuilder);
nsBoxFrame::BuildDisplayListForChildren(aBuilder, tempLists); nsBoxFrame::BuildDisplayListForChildren(aBuilder, tempLists);
// This is a bit of a hack. Collect up all descendant display items // This is a bit of a hack. Collect up all descendant display items

2
layout/xul/tree/nsTreeColFrame.cpp
View file

@ -117,7 +117,7 @@ nsTreeColFrame::BuildDisplayListForChildren(nsDisplayListBuilder* aBuilder,
return; return;
} }
nsDisplayListCollection set; nsDisplayListCollection set(aBuilder);
nsBoxFrame::BuildDisplayListForChildren(aBuilder, set); nsBoxFrame::BuildDisplayListForChildren(aBuilder, set);
WrapListsInRedirector(aBuilder, set, aLists); WrapListsInRedirector(aBuilder, set, aLists);