From e12c1e71550896162302aec1ec80684ea8a8b8ff Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Tue, 25 Oct 2016 16:54:45 -0700 Subject: [PATCH] Backed out changeset 9b715399e585 (bug 1310123) for build failures a=backout CLOSED TREE --- layout/style/nsStyleStruct.cpp | 6 ++++++ layout/style/nsStyleStruct.h | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 7e755e25f3db..9d76b0832a36 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -45,6 +45,11 @@ static_assert((((1 << nsStyleStructID_Length) - 1) & ~(NS_STYLE_INHERIT_MASK)) == 0, "Not enough bits in NS_STYLE_INHERIT_MASK"); +// These are the limits that we choose to clamp grid line numbers to. +// http://dev.w3.org/csswg/css-grid/#overlarge-grids +const int32_t nsStyleGridLine::kMinLine = -10000; +const int32_t nsStyleGridLine::kMaxLine = 10000; + static bool EqualURIs(nsIURI *aURI1, nsIURI *aURI2) { @@ -817,6 +822,7 @@ nsStyleXUL::CalcDifference(const nsStyleXUL& aNewData) const // -------------------- // nsStyleColumn // +/* static */ const uint32_t nsStyleColumn::kMaxColumnCount = 1000; nsStyleColumn::nsStyleColumn(StyleStructContext aContext) : mColumnCount(NS_STYLE_COLUMN_COUNT_AUTO) diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index 5a7e85197a30..b9ac3ff32771 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -1593,11 +1593,9 @@ struct nsStyleGridLine int32_t mInteger; // 0 means not provided nsString mLineName; // Empty string means not provided. - // These are the limits that we choose to clamp grid line numbers to. - // http://dev.w3.org/csswg/css-grid/#overlarge-grids // mInteger is clamped to this range: - static const int32_t kMinLine = -10000; - static const int32_t kMaxLine = 10000; + static const int32_t kMinLine; + static const int32_t kMaxLine; nsStyleGridLine() : mHasSpan(false) @@ -3469,7 +3467,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleColumn * This is the maximum number of columns we can process. It's used in both * nsColumnSetFrame and nsRuleNode. */ - static const uint32_t kMaxColumnCount = 1000; + static const uint32_t kMaxColumnCount; uint32_t mColumnCount; // [reset] see nsStyleConsts.h nsStyleCoord mColumnWidth; // [reset] coord, auto