diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-03 08:34:51 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-03 08:34:51 +0100 |
| commit | 23f587278abc939b5499e51863e3e63619be8a95 (patch) | |
| tree | 94d51331f38585695339742e26c0b1498d32abaf /layout/style/nsCSSPropList.h | |
| parent | 9a8a050294414a7d248a4ec872744b43e1b9bfb1 (diff) | |
| parent | 4874970d329943e08bcca7c61e7b7d2bc0f7c9d3 (diff) | |
| download | UXP-23f587278abc939b5499e51863e3e63619be8a95.tar UXP-23f587278abc939b5499e51863e3e63619be8a95.tar.gz UXP-23f587278abc939b5499e51863e3e63619be8a95.tar.lz UXP-23f587278abc939b5499e51863e3e63619be8a95.tar.xz UXP-23f587278abc939b5499e51863e3e63619be8a95.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
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 b04921dcb..2049f70e8 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, |