Remove FX_WORD in favor of uint16_t.

xfa/fde/css/fde_cssstyleselector.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
 #define XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_
 
 #include <vector>
@@ skipping 126 matching lines @@
   FX_FLOAT ApplyNumber(FDE_CSSPRIMITIVETYPE eUnit,
                        FX_FLOAT fValue,
                        FX_FLOAT fPercentBase);
   FX_BOOL SetLengthWithPercent(FDE_CSSLENGTH& width,
                                FDE_CSSPRIMITIVETYPE eType,
                                IFDE_CSSPrimitiveValue* pPrimitive,
                                FX_FLOAT fFontSize);
   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);
   FDE_CSSLISTSTYLETYPE ToListStyleType(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSLISTSTYLEPOSITION ToListStylePosition(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSVISIBILITY ToVisibility(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSWHITESPACE ToWhiteSpace(FDE_CSSPROPERTYVALUE eValue);
   FX_DWORD ToTextDecoration(IFDE_CSSValueList* pList);
   FDE_CSSTEXTTRANSFORM ToTextTransform(FDE_CSSPROPERTYVALUE eValue);
   FDE_CSSFONTVARIANT ToFontVariant(FDE_CSSPROPERTYVALUE eValue);
@@ skipping 106 matching lines @@
   FDE_CSSLENGTH m_WordSpacing;
   FDE_CSSLENGTH m_TextIndent;
   IFDE_CSSValueList* m_pFontFamily;
   IFDE_CSSValueList* m_pQuotes;
   IFDE_CSSValueList* m_pCursorUris;
   FDE_CSSCURSOR m_eCursor;
   FX_FLOAT m_fFontSize;
   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;
+  uint16_t m_eFontVariant : 1;

[dsinclair, 2016/03/21 21:33:12]

uint32_t and a uint8_t ? looks like there are 33 bits used.

[Tom Sepez, 2016/03/21 21:59:48]

Argh, bitfields.  One of those places where I like the blink style of just
saying "unsigned" and letting the compiler figure it out.  The smaller you make
this type, the more likely it is that one of these fields will span a boundary,
and be pushed out to the next item.

I see what you're getting at though.  Done.

+  uint16_t m_eFontStyle : 1;
+  uint16_t m_bTextEmphasisColorCurrent : 1;
+  uint16_t m_eTextAligh : 2;
+  uint16_t m_eVisibility : 2;
+  uint16_t m_eWhiteSpace : 3;
+  uint16_t m_eTextTransform : 2;
+  uint16_t m_eWritingMode : 2;
+  uint16_t m_eWordBreak : 2;
+  uint16_t m_eLineBreak : 2;
+  uint16_t m_eTextEmphasisFill : 1;
+  uint16_t m_eTextEmphasisMark : 3;
+  uint16_t m_eCaptionSide : 3;
 
-  FX_WORD m_eRubyAlign : 4;
-  FX_WORD m_eRubyOverhang : 2;
-  FX_WORD m_eRubyPosition : 2;
+  uint16_t m_eRubyAlign : 4;
+  uint16_t m_eRubyOverhang : 2;
+  uint16_t m_eRubyPosition : 2;
 };
 class CFDE_CSSNonInheritedData {
  public:
   void Reset() {
     FXSYS_memset(this, 0, sizeof(CFDE_CSSNonInheritedData));
     m_MarginWidth = m_BorderWidth =
         m_PaddingWidth.Set(FDE_CSSLENGTHUNIT_Point, 0);
     m_MinBoxSize.Set(FDE_CSSLENGTHUNIT_Point, 0);
     m_MaxBoxSize.Set(FDE_CSSLENGTHUNIT_None);
     m_eDisplay = FDE_CSSDISPLAY_Inline;
@@ skipping 228 matching lines @@
   virtual int32_t CountFontFamilies() const {
     return m_InheritedData.m_pFontFamily
                ? m_InheritedData.m_pFontFamily->CountValues()
                : 0;
   }
   virtual const FX_WCHAR* GetFontFamily(int32_t index) const {
     return ((IFDE_CSSPrimitiveValue*)(m_InheritedData.m_pFontFamily->GetValue(
                 index)))
         ->GetString(index);
   }
-  virtual FX_WORD GetFontWeight() const {
+  virtual uint16_t GetFontWeight() const {
     return m_InheritedData.m_wFontWeight;
   }
   virtual FDE_CSSFONTVARIANT GetFontVariant() const {
     return (FDE_CSSFONTVARIANT)m_InheritedData.m_eFontVariant;
   }
   virtual FDE_CSSFONTSTYLE GetFontStyle() const {
     return (FDE_CSSFONTSTYLE)m_InheritedData.m_eFontStyle;
   }
   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) {
     m_InheritedData.m_eFontVariant = eFontVariant;
   }
   virtual void SetFontStyle(FDE_CSSFONTSTYLE eFontStyle) {
     m_InheritedData.m_eFontStyle = eFontStyle;
   }
   virtual void SetFontSize(FX_FLOAT fFontSize) {
     m_InheritedData.m_fFontSize = fFontSize;
@@ skipping 327 matching lines @@
     m_CustomProperties.Add(wsValue);
   }
   FX_DWORD m_dwRefCount;
   IFX_MEMAllocator* m_pAllocator;
   CFDE_CSSInheritedData m_InheritedData;
   CFDE_CSSNonInheritedData m_NonInheritedData;
   CFX_WideStringArray m_CustomProperties;
 };
 
 #endif  // XFA_FDE_CSS_FDE_CSSSTYLESELECTOR_H_