Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1424524 part 2 - Use IsFlexOrGridContainer() in a few more places. r=dholbert

Browse Source 
MozReview-Commit-ID: 3BwSheNfbrx
This commit is contained in:
Mats Palmgren 2017-12-14 16:21:49 +01:00
parent 979ed84b2e
commit 22e39fd75a
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
layout/base/nsCSSFrameConstructor.cpp
View File

@ -10028,12 +10028,7 @@ nsCSSFrameConstructor::CreateNeededAnonFlexOrGridItems(
FrameConstructionItemList& aItems,
nsIFrame* aParentFrame)
{
if (aItems.IsEmpty()) {
return;
}
const LayoutFrameType parentType = aParentFrame->Type();
if (parentType != LayoutFrameType::FlexContainer &&
parentType != LayoutFrameType::GridContainer) {
if (aItems.IsEmpty() || !::IsFlexOrGridContainer(aParentFrame)) {
return;
}
@ -10717,8 +10712,7 @@ static bool
FrameWantsToBeInAnonymousItem(const nsIFrame* aContainerFrame,
const nsIFrame* aFrame)
{
MOZ_ASSERT(aContainerFrame->Type() == LayoutFrameType::FlexContainer ||
aContainerFrame->Type() == LayoutFrameType::GridContainer);
MOZ_ASSERT(::IsFlexOrGridContainer(aContainerFrame));
// Any line-participant frames (e.g. text) definitely want to be wrapped in
// an anonymous flex/grid item.
@ -10742,9 +10736,7 @@ VerifyGridFlexContainerChildren(nsIFrame* aParentFrame,
const nsFrameList& aChildren)
{
#ifdef DEBUG
auto parentType = aParentFrame->Type();
if (parentType != LayoutFrameType::FlexContainer &&
parentType != LayoutFrameType::GridContainer) {
if (!::IsFlexOrGridContainer(aParentFrame)) {
return;
}