From ddaee7c1be914cc28a28cbe27e5922215b3b2e6f Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sun, 10 Oct 2021 23:09:26 +0000 Subject: Issue #1830 - Remove --disable-xul config and conditionals. --- layout/generic/nsFrame.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'layout/generic/nsFrame.cpp') diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index b8e66ecbcd..14d411e6ab 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -10759,12 +10759,10 @@ void DR_State::InitFrameTypeTable() AddFrameTypeInfo(nsGkAtoms::textInputFrame, "textCtl", "textInput"); AddFrameTypeInfo(nsGkAtoms::textFrame, "text", "text"); AddFrameTypeInfo(nsGkAtoms::viewportFrame, "VP", "viewport"); -#ifdef MOZ_XUL AddFrameTypeInfo(nsGkAtoms::XULLabelFrame, "XULLabel", "XULLabel"); AddFrameTypeInfo(nsGkAtoms::boxFrame, "Box", "Box"); AddFrameTypeInfo(nsGkAtoms::sliderFrame, "Slider", "Slider"); AddFrameTypeInfo(nsGkAtoms::popupSetFrame, "PopupSet", "PopupSet"); -#endif AddFrameTypeInfo(nullptr, "unknown", "unknown"); } @@ -11382,10 +11380,8 @@ ReflowInput::DisplayInitFrameTypeExit(nsIFrame* aFrame, "grid", "inline-grid", "ruby", "ruby-base", "ruby-base-container", "ruby-text", "ruby-text-container", "contents", "-webkit-box", "-webkit-inline-box", "box", "inline-box", -#ifdef MOZ_XUL "grid", "inline-grid", "grid-group", "grid-line", "stack", "inline-stack", "deck", "groupbox", "popup", -#endif }; const uint32_t display = static_cast(disp->mDisplay); if (display >= ArrayLength(displayTypes)) -- cgit v1.2.3