Bug 1144096 part 8 - [css-grid] Add a new state flag, eBreakBefore, to record where breaks occur between tracks. r=dholbert
authorMats Palmgren <mats@mozilla.com>
Fri, 11 Mar 2016 17:39:26 +0100
changeset 288300 91e99c2febec17a7cc963077a77868a2a49480b9
parent 288299 1fbadb0b2f44ff5335e6cea6ed51cefcedf92ad5
child 288301 0b2efb5e8dfbdfba0ba032d18f2bd76ad9c997de
push id30079
push userryanvm@gmail.com
push dateSat, 12 Mar 2016 20:24:19 +0000
treeherdermozilla-central@d1d47ba19ce9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1144096
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1144096 part 8 - [css-grid] Add a new state flag, eBreakBefore, to record where breaks occur between tracks. r=dholbert
layout/generic/nsGridContainerFrame.cpp
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -60,16 +60,17 @@ struct nsGridContainerFrame::TrackSize
     eMaxContentMaxSizing =    0x40,
     eAutoOrMaxContentMaxSizing = eAutoMaxSizing | eMaxContentMaxSizing,
     eIntrinsicMaxSizing = eAutoOrMaxContentMaxSizing | eMinContentMaxSizing,
     eFlexMaxSizing =          0x80,
     eFrozen =                0x100,
     eSkipGrowUnlimited1 =    0x200,
     eSkipGrowUnlimited2 =    0x400,
     eSkipGrowUnlimited = eSkipGrowUnlimited1 | eSkipGrowUnlimited2,
+    eBreakBefore =           0x800,
   };
 
   static bool IsMinContent(const nsStyleCoord& aCoord)
   {
     return aCoord.GetUnit() == eStyleUnit_Enumerated &&
       aCoord.GetIntValue() == NS_STYLE_GRID_TRACK_BREADTH_MIN_CONTENT;
   }
 
@@ -4155,17 +4156,17 @@ nsGridContainerFrame::SanityCheckAnonymo
       }
     }
   }
 }
 
 void
 nsGridContainerFrame::TrackSize::Dump() const
 {
-  printf("mBase=%d mLimit=%d", mBase, mLimit);
+  printf("mPosition=%d mBase=%d mLimit=%d", mPosition, mBase, mLimit);
 
   printf(" min:");
   if (mState & eAutoMinSizing) {
     printf("auto ");
   } else if (mState & eMinContentMinSizing) {
     printf("min-content ");
   } else if (mState & eMaxContentMinSizing) {
     printf("max-content ");
@@ -4182,11 +4183,14 @@ nsGridContainerFrame::TrackSize::Dump() 
     printf("max-content ");
   } else if (mState & eFlexMaxSizing) {
     printf("flex ");
   }
 
   if (mState & eFrozen) {
     printf("frozen ");
   }
+  if (mState & eBreakBefore) {
+    printf("break-before ");
+  }
 }
 
 #endif // DEBUG