Index: xfa/fde/css/fde_cssstyleselector.h |
diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h |
index 4f8177f5c5c838465b49beea4375a22873222cf8..5016e8f5cb89aa01171fb3c5bf7f924373404368 100644 |
--- a/xfa/fde/css/fde_cssstyleselector.h |
+++ b/xfa/fde/css/fde_cssstyleselector.h |
@@ -144,7 +144,7 @@ class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target { |
FX_FLOAT ToFontSize(FDE_CSSPROPERTYVALUE eValue, FX_FLOAT fCurFontSize); |
FDE_CSSDISPLAY ToDisplay(FDE_CSSPROPERTYVALUE eValue); |
FDE_CSSTEXTALIGN ToTextAlign(FDE_CSSPROPERTYVALUE eValue); |
- FX_WORD ToFontWeight(FDE_CSSPROPERTYVALUE eValue); |
+ uint16_t ToFontWeight(FDE_CSSPROPERTYVALUE eValue); |
FDE_CSSFONTSTYLE ToFontStyle(FDE_CSSPROPERTYVALUE eValue); |
FDE_CSSBORDERSTYLE ToBorderStyle(FDE_CSSPROPERTYVALUE eValue); |
FDE_CSSVERTICALALIGN ToVerticalAlign(FDE_CSSPROPERTYVALUE eValue); |
@@ -271,27 +271,26 @@ class CFDE_CSSInheritedData { |
FX_FLOAT m_fLineHeight; |
FX_ARGB m_dwFontColor; |
FX_ARGB m_dwTextEmphasisColor; |
- FX_WORD m_wFontWeight; |
+ uint16_t m_wFontWeight; |
int32_t m_iWidows; |
int32_t m_iOrphans; |
const FX_WCHAR* m_pszTextEmphasisCustomMark; |
- FX_WORD m_eFontVariant : 1; |
- FX_WORD m_eFontStyle : 1; |
- FX_WORD m_bTextEmphasisColorCurrent : 1; |
- FX_WORD m_eTextAligh : 2; |
- FX_WORD m_eVisibility : 2; |
- FX_WORD m_eWhiteSpace : 3; |
- FX_WORD m_eTextTransform : 2; |
- FX_WORD m_eWritingMode : 2; |
- FX_WORD m_eWordBreak : 2; |
- FX_WORD m_eLineBreak : 2; |
- FX_WORD m_eTextEmphasisFill : 1; |
- FX_WORD m_eTextEmphasisMark : 3; |
- FX_WORD m_eCaptionSide : 3; |
- |
- FX_WORD m_eRubyAlign : 4; |
- FX_WORD m_eRubyOverhang : 2; |
- FX_WORD m_eRubyPosition : 2; |
+ uint32_t m_eFontVariant : 1; |
+ uint32_t m_eFontStyle : 1; |
+ uint32_t m_bTextEmphasisColorCurrent : 1; |
+ uint32_t m_eTextAligh : 2; |
+ uint32_t m_eVisibility : 2; |
+ uint32_t m_eWhiteSpace : 3; |
+ uint32_t m_eTextTransform : 2; |
+ uint32_t m_eWritingMode : 2; |
+ uint32_t m_eWordBreak : 2; |
+ uint32_t m_eLineBreak : 2; |
+ uint32_t m_eTextEmphasisFill : 1; |
+ uint32_t m_eTextEmphasisMark : 3; |
+ uint32_t m_eCaptionSide : 3; |
+ uint8_t m_eRubyAlign : 4; |
+ uint8_t m_eRubyOverhang : 2; |
+ uint8_t m_eRubyPosition : 2; |
}; |
class CFDE_CSSNonInheritedData { |
public: |
@@ -540,7 +539,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, |
index))) |
->GetString(index); |
} |
- virtual FX_WORD GetFontWeight() const { |
+ virtual uint16_t GetFontWeight() const { |
return m_InheritedData.m_wFontWeight; |
} |
virtual FDE_CSSFONTVARIANT GetFontVariant() const { |
@@ -551,7 +550,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, |
} |
virtual FX_FLOAT GetFontSize() const { return m_InheritedData.m_fFontSize; } |
virtual FX_ARGB GetColor() const { return m_InheritedData.m_dwFontColor; } |
- virtual void SetFontWeight(FX_WORD wFontWeight) { |
+ virtual void SetFontWeight(uint16_t wFontWeight) { |
m_InheritedData.m_wFontWeight = wFontWeight; |
} |
virtual void SetFontVariant(FDE_CSSFONTVARIANT eFontVariant) { |