From 23b6600c9cb9a891e93ed28d5af48f4a2a616abe Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Thu, 7 Dec 2017 18:44:57 +0100
Subject: [PATCH] Bug 1423292 - [css-grid] Add a couple of ItemState bits to
 Dump(), and make an ItemState assertion stricter (DEBUG-only changes). 
 r=dholbert

MozReview-Commit-ID: 7JhmMenpXN
---
 layout/generic/nsGridContainerFrame.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
index 94361bca1103..5128fdbb4414 100644
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -667,6 +667,12 @@ nsGridContainerFrame::GridItemInfo::Dump() const
     if (state & ItemState::eIsFlexing) {
       printf("flexing ");
     }
+    if (state & ItemState::eApplyAutoMinSize) {
+      printf("auto-min-size ");
+    }
+    if (state & ItemState::eClampMarginBoxMinSize) {
+      printf("clamp ");
+    }
     if (state & ItemState::eFirstBaseline) {
       printf("first baseline %s-alignment ",
              (state & ItemState::eSelfBaseline) ? "self" : "content");
@@ -4189,8 +4195,10 @@ nsGridContainerFrame::Tracks::ResolveIntrinsicSize(
   iter.Reset();
   for (; !iter.AtEnd(); iter.Next()) {
     auto& gridItem = aGridItems[iter.ItemIndex()];
-    MOZ_ASSERT(!(gridItem.mState[mAxis] & ItemState::eApplyAutoMinSize),
-               "Why is eApplyAutoMinSize set already?");
+    MOZ_ASSERT(!(gridItem.mState[mAxis] &
+                 (ItemState::eApplyAutoMinSize | ItemState::eIsFlexing |
+                  ItemState::eClampMarginBoxMinSize)),
+               "Why are any of these bits set already?");
     const GridArea& area = gridItem.mArea;
     const LineRange& lineRange = area.*aRange;
     uint32_t span = lineRange.Extent();