summaryrefslogtreecommitdiffstats
path: root/layout/style/nsStyleStruct.cpp
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-10-30 22:36:49 +0000
committerMoonchild <moonchild@palemoon.org>2020-10-30 22:36:49 +0000
commit9b1406f183705e81701d9136f6df63cae72b5362 (patch)
tree6d8dbecf751fea15bc1e6d28984638fdd5b392b1 /layout/style/nsStyleStruct.cpp
parent6a4c3caa8ee469558c27077ddfad8268b1575da4 (diff)
parentd22717ff98ccde224883c0cc99a330e92c7ac4a5 (diff)
downloadUXP-9b1406f183705e81701d9136f6df63cae72b5362.tar
UXP-9b1406f183705e81701d9136f6df63cae72b5362.tar.gz
UXP-9b1406f183705e81701d9136f6df63cae72b5362.tar.lz
UXP-9b1406f183705e81701d9136f6df63cae72b5362.tar.xz
UXP-9b1406f183705e81701d9136f6df63cae72b5362.zip
Merge pull request 'Fix up -moz-tab-size and unprefix it.' (#1674) from athenian200/UXP:tab-size-length into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1674
Diffstat (limited to 'layout/style/nsStyleStruct.cpp')
-rw-r--r--layout/style/nsStyleStruct.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index c0ea9c256..073cfcd5e 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -3806,10 +3806,10 @@ nsStyleText::nsStyleText(StyleStructContext aContext)
, mControlCharacterVisibility(nsCSSParser::ControlCharVisibilityDefault())
, mTextEmphasisStyle(NS_STYLE_TEXT_EMPHASIS_STYLE_NONE)
, mTextRendering(NS_STYLE_TEXT_RENDERING_AUTO)
- , mTabSize(NS_STYLE_TABSIZE_INITIAL)
, mTextEmphasisColor(StyleComplexColor::CurrentColor())
, mWebkitTextFillColor(StyleComplexColor::CurrentColor())
, mWebkitTextStrokeColor(StyleComplexColor::CurrentColor())
+ , mTabSize(float(NS_STYLE_TABSIZE_INITIAL), eStyleUnit_Factor)
, mWordSpacing(0, nsStyleCoord::CoordConstructor)
, mLetterSpacing(eStyleUnit_Normal)
, mLineHeight(eStyleUnit_Normal)
@@ -3844,10 +3844,10 @@ nsStyleText::nsStyleText(const nsStyleText& aSource)
, mTextEmphasisPosition(aSource.mTextEmphasisPosition)
, mTextEmphasisStyle(aSource.mTextEmphasisStyle)
, mTextRendering(aSource.mTextRendering)
- , mTabSize(aSource.mTabSize)
, mTextEmphasisColor(aSource.mTextEmphasisColor)
, mWebkitTextFillColor(aSource.mWebkitTextFillColor)
, mWebkitTextStrokeColor(aSource.mWebkitTextStrokeColor)
+ , mTabSize(aSource.mTabSize)
, mWordSpacing(aSource.mWordSpacing)
, mLetterSpacing(aSource.mLetterSpacing)
, mLineHeight(aSource.mLineHeight)