diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-07-13 15:17:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 15:17:10 +0200 |
| commit | ec32d19a84b2cc61a34442a4562e080cb6cd7db0 (patch) | |
| tree | 23d12811c6660bf6459ec82890d800029fbd8d4f /layout | |
| parent | d4b0944e051effc3a4fc089441011ffee6f0dc5e (diff) | |
| parent | 71a1c47759f30f114ad4e5634ba5224744b7c18c (diff) | |
| download | UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar.gz UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar.lz UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar.xz UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.zip | |
Merge pull request #628 from janekptacijarabaci/build_bustage_debug_1
Fix Build Bustage - with "--enable-debug"
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/base/nsLayoutUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 9d8dd81bf..062fbfe15 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -5057,7 +5057,7 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis aAxis, NS_PRECONDITION(aFrame->GetParent(), "IntrinsicForAxis called on frame not in tree"); NS_PRECONDITION(aType == MIN_ISIZE || aType == PREF_ISIZE, "bad type"); - MOZ_ASSERT(aFrame->GetParent()->Type() != LayoutFrameType::GridContainer || + MOZ_ASSERT(aFrame->GetParent()->GetType() != nsGkAtoms::gridContainerFrame || aPercentageBasis.isSome(), "grid layout should always pass a percentage basis"); |