diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
| commit | 263d8500ce68b279a2d055c322f0ab3eab634989 (patch) | |
| tree | 9f258c3d6186346dc4435427ce6565ec376efd5d /layout/style/nsCSSPropList.h | |
| parent | b06821da15b7ab2573cd18aea8048b94266e3a97 (diff) | |
| parent | 8beab28bfff78ccefc8677c5bdddd6f60c544600 (diff) | |
| download | uxp-263d8500ce68b279a2d055c322f0ab3eab634989.tar.gz | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/preferences/advanced.xul
# application/palemoon/config/version.txt
# modules/libpref/init/all.js
Diffstat (limited to 'layout/style/nsCSSPropList.h')
| -rw-r--r-- | layout/style/nsCSSPropList.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h index b04921dcb5..2049f70e88 100644 --- a/layout/style/nsCSSPropList.h +++ b/layout/style/nsCSSPropList.h @@ -564,7 +564,7 @@ CSS_PROP_BACKGROUND( CSS_PROPERTY_VALUE_LIST_USES_COMMAS, "", VARIANT_KEYWORD, // used by list parsing - kImageLayerOriginKTable, + kBackgroundOriginKTable, CSS_PROP_NO_OFFSET, eStyleAnimType_Discrete) CSS_PROP_SHORTHAND( @@ -2645,19 +2645,6 @@ CSS_PROP_SVG( nullptr, CSS_PROP_NO_OFFSET, eStyleAnimType_Discrete) -#ifndef MOZ_ENABLE_MASK_AS_SHORTHAND -CSS_PROP_SVGRESET( - mask, - mask, - Mask, - CSS_PROPERTY_PARSE_VALUE | - CSS_PROPERTY_CREATES_STACKING_CONTEXT, - "", - VARIANT_HUO, - nullptr, - CSS_PROP_NO_OFFSET, - eStyleAnimType_Discrete) -#else CSS_PROP_SHORTHAND( mask, mask, @@ -2672,7 +2659,7 @@ CSS_PROP_SVGRESET( CSS_PROPERTY_VALUE_LIST_USES_COMMAS, "", VARIANT_KEYWORD, // used by list parsing - kImageLayerOriginKTable, + kMaskClipKTable, CSS_PROP_NO_OFFSET, eStyleAnimType_Discrete) CSS_PROP_SVGRESET( @@ -2718,7 +2705,7 @@ CSS_PROP_SVGRESET( CSS_PROPERTY_VALUE_LIST_USES_COMMAS, "", VARIANT_KEYWORD, // used by list parsing - kImageLayerOriginKTable, + kMaskOriginKTable, CSS_PROP_NO_OFFSET, eStyleAnimType_Discrete) CSS_PROP_SHORTHAND( @@ -2776,7 +2763,6 @@ CSS_PROP_SVGRESET( kImageLayerSizeKTable, CSS_PROP_NO_OFFSET, eStyleAnimType_Custom) -#endif // MOZ_ENABLE_MASK_AS_SHORTHAND CSS_PROP_SVGRESET( mask-type, mask_type, |