diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 16:32:52 +0100 |
| commit | 0dca00b282fb06ec1512bccafd32e0a919242208 (patch) | |
| tree | 1f443869475eb32a8a8babfdf68b74b6d4d601cb /layout/style/nsComputedDOMStylePropertyList.h | |
| parent | 76fe52eb81db323ceaa8396de39b76efbce1c25e (diff) | |
| parent | 0b6d9a47051be9ef4d064c6f7c60717da91d0bc2 (diff) | |
| download | UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.gz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.lz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.xz UXP-0dca00b282fb06ec1512bccafd32e0a919242208.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'layout/style/nsComputedDOMStylePropertyList.h')
| -rw-r--r-- | layout/style/nsComputedDOMStylePropertyList.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/layout/style/nsComputedDOMStylePropertyList.h b/layout/style/nsComputedDOMStylePropertyList.h index 1983208ac..825976b58 100644 --- a/layout/style/nsComputedDOMStylePropertyList.h +++ b/layout/style/nsComputedDOMStylePropertyList.h @@ -332,7 +332,6 @@ COMPUTED_STYLE_PROP(marker_end, MarkerEnd) COMPUTED_STYLE_PROP(marker_mid, MarkerMid) COMPUTED_STYLE_PROP(marker_start, MarkerStart) COMPUTED_STYLE_PROP(mask, Mask) -#ifdef MOZ_ENABLE_MASK_AS_SHORTHAND COMPUTED_STYLE_PROP(mask_clip, MaskClip) COMPUTED_STYLE_PROP(mask_composite, MaskComposite) COMPUTED_STYLE_PROP(mask_image, MaskImage) @@ -343,7 +342,6 @@ COMPUTED_STYLE_PROP(mask_position_x, MaskPositionX) COMPUTED_STYLE_PROP(mask_position_y, MaskPositionY) COMPUTED_STYLE_PROP(mask_repeat, MaskRepeat) COMPUTED_STYLE_PROP(mask_size, MaskSize) -#endif COMPUTED_STYLE_PROP(mask_type, MaskType) COMPUTED_STYLE_PROP(paint_order, PaintOrder) COMPUTED_STYLE_PROP(shape_rendering, ShapeRendering) |