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/nsStyleStruct.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/nsStyleStruct.h')
-rw-r--r-- | layout/style/nsStyleStruct.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index 1cadea840..c8182b8f1 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -782,6 +782,8 @@ struct nsStyleImageLayers { struct Layer; friend struct Layer; struct Layer { + typedef mozilla::StyleGeometryBox StyleGeometryBox; + nsStyleImage mImage; // [reset] RefPtr<mozilla::css::URLValueData> mSourceURI; // [reset] // mask-only property @@ -793,9 +795,9 @@ struct nsStyleImageLayers { // or an ImageValue.) mozilla::Position mPosition; // [reset] Size mSize; // [reset] - uint8_t mClip; // [reset] See nsStyleConsts.h + StyleGeometryBox mClip; // [reset] See nsStyleConsts.h MOZ_INIT_OUTSIDE_CTOR - uint8_t mOrigin; // [reset] See nsStyleConsts.h + StyleGeometryBox mOrigin; // [reset] See nsStyleConsts.h uint8_t mAttachment; // [reset] See nsStyleConsts.h // background-only property // This property is used for background layer @@ -2755,7 +2757,7 @@ private: ReferenceBox mReferenceBox = ReferenceBox::NoBox; }; -using StyleClipPath = StyleShapeSource<StyleClipPathGeometryBox>; +using StyleClipPath = StyleShapeSource<StyleGeometryBox>; using StyleShapeOutside = StyleShapeSource<StyleShapeOutsideShapeBox>; } // namespace mozilla |