summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devtools/client/shared/developer-toolbar.js2
-rw-r--r--devtools/shared/css/generated/properties-db.js57
-rw-r--r--layout/base/nsLayoutUtils.cpp8
-rw-r--r--layout/style/nsCSSKeywordList.h2
-rw-r--r--layout/style/nsCSSProps.cpp12
-rw-r--r--layout/style/nsRuleNode.cpp2
-rw-r--r--layout/tables/BasicTableLayoutStrategy.cpp5
-rw-r--r--layout/tables/nsTableFrame.cpp2
8 files changed, 44 insertions, 46 deletions
diff --git a/devtools/client/shared/developer-toolbar.js b/devtools/client/shared/developer-toolbar.js
index d844024187..3c2838ddc8 100644
--- a/devtools/client/shared/developer-toolbar.js
+++ b/devtools/client/shared/developer-toolbar.js
@@ -1032,7 +1032,7 @@ OutputPanel.prototype._resize = function () {
break;
}
- this.document.body.style.width = "-moz-max-content";
+ this.document.body.style.width = "max-content";
let style = this._frame.contentWindow.getComputedStyle(this.document.body);
let frameWidth = parseInt(style.width, 10);
let width = Math.min(maxWidth, frameWidth);
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index 9ccebc8481..cff6dcf686 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -2209,13 +2209,13 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"content",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -2232,13 +2232,13 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"content",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -3304,9 +3304,7 @@ exports.CSS_PROPERTIES = {
"-moz-mac-source-list-selection",
"-moz-mac-vibrancy-dark",
"-moz-mac-vibrancy-light",
- "-moz-max-content",
"-moz-middle-with-baseline",
- "-moz-min-content",
"-moz-none",
"-moz-popup",
"-moz-pre-space",
@@ -3362,6 +3360,7 @@ exports.CSS_PROPERTIES = {
"bottom",
"bottom-outside",
"break-all",
+ "break-spaces",
"break-word",
"butt",
"button",
@@ -3493,6 +3492,7 @@ exports.CSS_PROPERTIES = {
"margin-box",
"match-source",
"mathematical",
+ "max-content",
"medium",
"menuarrow",
"menubar",
@@ -3510,6 +3510,7 @@ exports.CSS_PROPERTIES = {
"meterbar",
"meterchunk",
"middle",
+ "min-content",
"miter",
"mixed",
"multiply",
@@ -6000,13 +6001,13 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"content",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -6023,13 +6024,13 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"content",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -6816,12 +6817,12 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -6903,12 +6904,12 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -7651,11 +7652,11 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"none",
"unset"
]
@@ -7673,11 +7674,11 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"none",
"unset"
]
@@ -7695,11 +7696,11 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"none",
"unset"
]
@@ -7735,12 +7736,12 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -7757,12 +7758,12 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -7779,12 +7780,12 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
@@ -9543,12 +9544,12 @@ exports.CSS_PROPERTIES = {
"-moz-available",
"-moz-calc",
"-moz-fit-content",
- "-moz-max-content",
- "-moz-min-content",
"auto",
"calc",
"inherit",
"initial",
+ "max-content",
+ "min-content",
"unset"
]
},
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index bf215d1be9..2731b37f2a 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -4668,7 +4668,7 @@ GetDefiniteSizeTakenByBoxSizing(StyleBoxSizing aBoxSizing,
return sizeTakenByBoxSizing;
}
-// Handles only -moz-max-content and -moz-min-content, and
+// Handles only max-content and min-content, and
// -moz-fit-content for min-width and max-width, since the others
// (-moz-fit-content for width, and -moz-available) have no effect on
// intrinsic widths.
@@ -4696,10 +4696,10 @@ GetIntrinsicCoord(const nsStyleCoord& aStyle,
if (aProperty == PROP_WIDTH)
return false; // handle like 'width: auto'
if (aProperty == PROP_MAX_WIDTH)
- // constrain large 'width' values down to -moz-max-content
+ // constrain large 'width' values down to max-content
val = NS_STYLE_WIDTH_MAX_CONTENT;
else
- // constrain small 'width' or 'max-width' values up to -moz-min-content
+ // constrain small 'width' or 'max-width' values up to min-content
val = NS_STYLE_WIDTH_MIN_CONTENT;
}
@@ -4983,7 +4983,7 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis aAxis,
styleISize.GetIntValue() == NS_STYLE_WIDTH_MIN_CONTENT)) {
// -moz-fit-content and -moz-available enumerated widths compute intrinsic
// widths just like auto.
- // For -moz-max-content and -moz-min-content, we handle them like
+ // For max-content and min-content, we handle them like
// specified widths, but ignore box-sizing.
boxSizing = StyleBoxSizing::Content;
if (aMarginBoxMinSizeClamp != NS_MAXSIZE &&
diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
index d6486b18cf..bbe25893dd 100644
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -98,13 +98,11 @@ CSS_KEY(-moz-mac-menutextdisable, _moz_mac_menutextdisable)
CSS_KEY(-moz-mac-menutextselect, _moz_mac_menutextselect)
CSS_KEY(-moz-mac-disabledtoolbartext, _moz_mac_disabledtoolbartext)
CSS_KEY(-moz-mac-secondaryhighlight, _moz_mac_secondaryhighlight)
-CSS_KEY(-moz-max-content, _moz_max_content)
CSS_KEY(-moz-menuhover, _moz_menuhover)
CSS_KEY(-moz-menuhovertext, _moz_menuhovertext)
CSS_KEY(-moz-menubartext, _moz_menubartext)
CSS_KEY(-moz-menubarhovertext, _moz_menubarhovertext)
CSS_KEY(-moz-middle-with-baseline, _moz_middle_with_baseline)
-CSS_KEY(-moz-min-content, _moz_min_content)
CSS_KEY(-moz-nativehyperlinktext, _moz_nativehyperlinktext)
CSS_KEY(-moz-none, _moz_none)
CSS_KEY(-moz-oddtreerow, _moz_oddtreerow)
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index f084e45992..09cddb04ee 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -2256,8 +2256,8 @@ const KTableEntry nsCSSProps::kWhitespaceKTable[] = {
};
const KTableEntry nsCSSProps::kWidthKTable[] = {
- { eCSSKeyword__moz_max_content, NS_STYLE_WIDTH_MAX_CONTENT },
- { eCSSKeyword__moz_min_content, NS_STYLE_WIDTH_MIN_CONTENT },
+ { eCSSKeyword_max_content, NS_STYLE_WIDTH_MAX_CONTENT },
+ { eCSSKeyword_min_content, NS_STYLE_WIDTH_MIN_CONTENT },
{ eCSSKeyword__moz_fit_content, NS_STYLE_WIDTH_FIT_CONTENT },
{ eCSSKeyword__moz_available, NS_STYLE_WIDTH_AVAILABLE },
{ eCSSKeyword_UNKNOWN, -1 }
@@ -2265,11 +2265,11 @@ const KTableEntry nsCSSProps::kWidthKTable[] = {
// This must be the same as kWidthKTable, but just with 'content' added:
const KTableEntry nsCSSProps::kFlexBasisKTable[] = {
- { eCSSKeyword__moz_max_content, NS_STYLE_WIDTH_MAX_CONTENT },
- { eCSSKeyword__moz_min_content, NS_STYLE_WIDTH_MIN_CONTENT },
+ { eCSSKeyword_max_content, NS_STYLE_WIDTH_MAX_CONTENT },
+ { eCSSKeyword_min_content, NS_STYLE_WIDTH_MIN_CONTENT },
{ eCSSKeyword__moz_fit_content, NS_STYLE_WIDTH_FIT_CONTENT },
- { eCSSKeyword__moz_available, NS_STYLE_WIDTH_AVAILABLE },
- { eCSSKeyword_content, NS_STYLE_FLEX_BASIS_CONTENT },
+ { eCSSKeyword__moz_available, NS_STYLE_WIDTH_AVAILABLE },
+ { eCSSKeyword_content, NS_STYLE_FLEX_BASIS_CONTENT },
{ eCSSKeyword_UNKNOWN, -1 }
};
static_assert(ArrayLength(nsCSSProps::kFlexBasisKTable) ==
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index e824e77211..858d7feba3 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -8590,7 +8590,7 @@ nsRuleNode::ComputePositionData(void* aStartStruct,
}
}
- // We allow the enumerated box size property values -moz-min-content, etc. to
+ // We allow the enumerated box size property values min-content, etc. to
// be specified on both the {,min-,max-}width properties and the
// {,min-,max-}height properties, regardless of the writing mode. This is
// because the writing mode is not determined until here, at computed value
diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp
index 65835e68e8..8ece42fcb3 100644
--- a/layout/tables/BasicTableLayoutStrategy.cpp
+++ b/layout/tables/BasicTableLayoutStrategy.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// vim:cindent:ts=4:et:sw=4:
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -181,7 +180,7 @@ GetISizeInfo(nsRenderingContext *aRenderingContext,
maxISize.SetNoneValue();
} else if (maxISize.GetIntValue() == NS_STYLE_WIDTH_FIT_CONTENT) {
// for 'max-inline-size', '-moz-fit-content' is like
- // '-moz-max-content'
+ // 'max-content'
maxISize.SetIntValue(NS_STYLE_WIDTH_MAX_CONTENT,
eStyleUnit_Enumerated);
}
@@ -208,7 +207,7 @@ GetISizeInfo(nsRenderingContext *aRenderingContext,
minISize.SetCoordValue(0);
} else if (minISize.GetIntValue() == NS_STYLE_WIDTH_FIT_CONTENT) {
// for 'min-inline-size', '-moz-fit-content' is like
- // '-moz-min-content'
+ // 'min-content'
minISize.SetIntValue(NS_STYLE_WIDTH_MIN_CONTENT,
eStyleUnit_Enumerated);
}
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index 52a6eb0a3d..cf4231c01f 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -3813,7 +3813,7 @@ nsTableFrame::IsAutoLayout()
if (StyleTable()->mLayoutStrategy == NS_STYLE_TABLE_LAYOUT_AUTO)
return true;
// a fixed-layout inline-table must have a inline size
- // and tables with inline size set to '-moz-max-content' must be
+ // and tables with inline size set to 'max-content' must be
// auto-layout (at least as long as
// FixedTableLayoutStrategy::GetPrefISize returns nscoord_MAX)
const nsStyleCoord &iSize = StylePosition()->ISize(GetWritingMode());
generated by cgit v1.2.3 (git 2.26.2) at 2024-09-19 16:20:26 +0000