Bug 1308239 : Remove CSS mask-type pref layout.css.masking.enabled.
MozReview-Commit-ID: GXHgwWcURVn
--- a/layout/reftests/svg/reftest-stylo.list
+++ b/layout/reftests/svg/reftest-stylo.list
@@ -240,20 +240,20 @@ fuzzy-if(skiaContent,1,5) pref(svg.marke
== mask-extref-dataURI-01.svg mask-extref-dataURI-01.svg
== mask-containing-masked-content-01.svg mask-containing-masked-content-01.svg
== mask-transformed-01.svg mask-transformed-01.svg
== mask-transformed-02.svg mask-transformed-02.svg
== mask-transformed-child-01.svg mask-transformed-child-01.svg
# fuzzy because of the differences between clipPath and mask clipping
== mask-and-clipPath.html mask-and-clipPath.html
== mask-and-clipPath-2.svg mask-and-clipPath-2.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-01.svg mask-type-01.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-02.svg mask-type-02.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-03.svg mask-type-03.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-04.svg mask-type-04.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-01.svg mask-type-01.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-02.svg mask-type-02.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-03.svg mask-type-03.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-04.svg mask-type-04.svg
== nested-viewBox-01.svg nested-viewBox-01.svg
fuzzy-if(skiaContent,3,448000) == nesting-invalid-01.svg nesting-invalid-01.svg
fuzzy-if(d2d&&/^Windows\x20NT\x20(6\.1|10\.0)/.test(http.oscpu),63,168) fuzzy-if(cocoaWidget,1,122) fuzzy-if(skiaContent,2,1000) == non-scaling-stroke-01.svg non-scaling-stroke-01.svg
# bug 1074161 for Win7 and OSX 10.8
fuzzy-if(gtkWidget,1,99) fuzzy-if(!contentSameGfxBackendAsCanvas,9,99) fuzzy-if(Android||B2G,9,586) == non-scaling-stroke-02.svg non-scaling-stroke-02.svg
== non-scaling-stroke-03.svg non-scaling-stroke-03.svg
== objectBoundingBox-and-clipPath.svg objectBoundingBox-and-clipPath.svg
# Bug 588684
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -215,20 +215,20 @@ fuzzy-if(skiaContent,1,10000) == mask-ba
== mask-extref-dataURI-01.svg pass.svg
== mask-containing-masked-content-01.svg pass.svg
== mask-transformed-01.svg mask-transformed-01-ref.svg
== mask-transformed-02.svg pass.svg
== mask-transformed-child-01.svg mask-transformed-child-01-ref.svg
# fuzzy because of the differences between clipPath and mask clipping
fuzzy(27,28) == mask-and-clipPath.html mask-and-clipPath-ref.html
== mask-and-clipPath-2.svg pass.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-01.svg mask-type-01-ref.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-02.svg mask-type-01-ref.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-03.svg mask-type-01-ref.svg
-pref(layout.css.masking.enabled,true) fuzzy-if(d2d||skiaContent,1,6400) == mask-type-04.svg mask-type-01-ref.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-01.svg mask-type-01-ref.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-02.svg mask-type-01-ref.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-03.svg mask-type-01-ref.svg
+fuzzy-if(d2d||skiaContent,1,6400) == mask-type-04.svg mask-type-01-ref.svg
== nested-viewBox-01.svg pass.svg
fuzzy-if(skiaContent,3,448000) == nesting-invalid-01.svg nesting-invalid-01-ref.svg
fuzzy-if(d2d&&/^Windows\x20NT\x20(6\.1|10\.0)/.test(http.oscpu),63,168) fuzzy-if(cocoaWidget,1,122) fuzzy-if(skiaContent,2,1000) == non-scaling-stroke-01.svg non-scaling-stroke-01-ref.svg # bug 1074161 for Win7 and OSX 10.8
fuzzy-if(gtkWidget,1,99) fuzzy-if(!contentSameGfxBackendAsCanvas,9,99) fuzzy-if(Android||B2G,9,586) == non-scaling-stroke-02.svg non-scaling-stroke-02-ref.svg
== non-scaling-stroke-03.svg non-scaling-stroke-03-ref.svg
== objectBoundingBox-and-clipPath.svg pass.svg
# Bug 588684
random-if(gtkWidget) == objectBoundingBox-and-fePointLight-01.svg objectBoundingBox-and-fePointLight-01-ref.svg
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -2787,17 +2787,17 @@ CSS_PROP_SVGRESET(
CSS_PROP_NO_OFFSET,
eStyleAnimType_Custom)
#endif // MOZ_ENABLE_MASK_AS_SHORTHAND
CSS_PROP_SVGRESET(
mask-type,
mask_type,
MaskType,
CSS_PROPERTY_PARSE_VALUE,
- "layout.css.masking.enabled",
+ "",
VARIANT_HK,
kMaskTypeKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
#ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL
CSS_PROP_FONT(
-moz-math-display,
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -1796,16 +1796,24 @@ var gCSSProperties = {
"calc(-2px)",
"calc(50%)",
"calc(3*25px)",
"calc(25px*3)",
"calc(3*25px + 50%)",
],
invalid_values: [ "5", "..25px", ".+5px", ".px", "-.px", "++5px", "-+4px", "+-3px", "--7px", "+-.6px", "-+.5px", "++.7px", "--.4px" ],
},
+ "mask-type": {
+ domProp: "maskType",
+ inherited: false,
+ type: CSS_TYPE_LONGHAND,
+ initial_values: [ "luminance" ],
+ other_values: [ "alpha" ],
+ invalid_values: [],
+ },
"-moz-outline-radius": {
domProp: "MozOutlineRadius",
inherited: false,
type: CSS_TYPE_TRUE_SHORTHAND,
prerequisites: { "width": "200px", "height": "100px", "display": "inline-block"},
subproperties: [ "-moz-outline-radius-bottomleft", "-moz-outline-radius-bottomright", "-moz-outline-radius-topleft", "-moz-outline-radius-topright" ],
initial_values: [ "0", "0px", "calc(-2px)", "calc(0px) calc(0pt)", "calc(0px) calc(0em)" ],
other_values: [ "0%", "3%", "1px", "2em", "3em 2px", "2pt 3% 4em", "2px 2px 2px 2px", // circular
@@ -5556,27 +5564,16 @@ if (IsCSSPropertyPrefEnabled("layout.css
"digits 3 all", "digits foo", "digits all", "digits 3.0" ]
};
if (IsCSSPropertyPrefEnabled("layout.css.text-combine-upright-digits.enabled")) {
gCSSProperties["text-combine-upright"].other_values.push(
"digits", "digits 2", "digits 3", "digits 4", "digits 3");
}
}
-if (IsCSSPropertyPrefEnabled("layout.css.masking.enabled")) {
- gCSSProperties["mask-type"] = {
- domProp: "maskType",
- inherited: false,
- type: CSS_TYPE_LONGHAND,
- initial_values: [ "luminance" ],
- other_values: [ "alpha" ],
- invalid_values: []
- };
-}
-
if (IsCSSPropertyPrefEnabled("svg.paint-order.enabled")) {
gCSSProperties["paint-order"] = {
domProp: "paintOrder",
inherited: true,
type: CSS_TYPE_LONGHAND,
initial_values: [ "normal" ],
other_values: [ "fill", "fill stroke", "fill stroke markers", "stroke markers fill" ],
invalid_values: [ "fill stroke markers fill", "fill normal" ]
--- a/layout/style/test/test_computed_style_prefs.html
+++ b/layout/style/test/test_computed_style_prefs.html
@@ -67,17 +67,16 @@ function step() {
// ----
var gProps = {
"layout.css.text-combine-upright.enabled": ["text-combine-upright"],
"layout.css.image-orientation.enabled": ["image-orientation"],
"layout.css.mix-blend-mode.enabled": ["mix-blend-mode"],
"layout.css.isolation.enabled": [ "isolation"],
- "layout.css.masking.enabled": ["mask-type"],
"layout.css.touch_action.enabled": ["touch-action"],
"svg.transform-box.enabled": ["transform-box"]
};
var gCS = getComputedStyle(document.body, "");
var gLengthWithAllPrefsDisabled;
var gTestIndex = 0;
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2462,19 +2462,16 @@ pref("layout.css.dpi", -1);
// automatically based on user settings for the platform (e.g., "UI scale factor"
// on Mac). A positive value is used as-is. This effectively controls the size
// of a CSS "px". This is only used for windows on the screen, not for printing.
pref("layout.css.devPixelsPerPx", "-1.0");
// Is support for CSS initial-letter property enabled?
pref("layout.css.initial-letter.enabled", false);
-// Is support for CSS Masking features enabled?
-pref("layout.css.masking.enabled", true);
-
// Is support for mix-blend-mode enabled?
pref("layout.css.mix-blend-mode.enabled", true);
// Is support for isolation enabled?
pref("layout.css.isolation.enabled", true);
// Is support for CSS Filters enabled?
pref("layout.css.filters.enabled", true);