1 files changed, 14 insertions, 204 deletions

diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h
index 88b0fe2db4..42662cfb73 100644
--- a/xfa/fde/css/fde_css.h
+++ b/xfa/fde/css/fde_css.h
@@ -26,15 +26,17 @@ class IFDE_CSSStyleSheet;
 class IFDE_CSSValue;
 class IFDE_CSSValueList;
 
-#define FDE_CSSMEDIATYPE_Braille 0x01
-#define FDE_CSSMEDIATYPE_Emboss 0x02
-#define FDE_CSSMEDIATYPE_Handheld 0x04
-#define FDE_CSSMEDIATYPE_Print 0x08
-#define FDE_CSSMEDIATYPE_Projection 0x10
-#define FDE_CSSMEDIATYPE_Screen 0x20
-#define FDE_CSSMEDIATYPE_TTY 0x40
-#define FDE_CSSMEDIATYPE_TV 0x80
-#define FDE_CSSMEDIATYPE_ALL 0xFF
+enum FDE_CSSMEDIATYPE {
+  FDE_CSSMEDIATYPE_Braille = 0x01,
+  FDE_CSSMEDIATYPE_Emboss = 0x02,
+  FDE_CSSMEDIATYPE_Handheld = 0x04,
+  FDE_CSSMEDIATYPE_Print = 0x08,
+  FDE_CSSMEDIATYPE_Projection = 0x10,
+  FDE_CSSMEDIATYPE_Screen = 0x20,
+  FDE_CSSMEDIATYPE_TTY = 0x40,
+  FDE_CSSMEDIATYPE_TV = 0x80,
+  FDE_CSSMEDIATYPE_ALL = 0xFF,
+};
 
 enum FDE_CSSVALUETYPE {
   FDE_CSSVALUETYPE_Primitive = 1 << 0,
@@ -70,280 +72,94 @@ enum class FDE_CSSPrimitiveType : uint8_t {
 
 enum class FDE_CSSPropertyValue : uint8_t {
   Bolder = 0,
-  LowerLatin,
-  Lowercase,
-  LowerGreek,
-  Sesame,
   None,
-  NwResize,
-  WResize,
   Dot,
-  End,
-  Ltr,
-  Pre,
-  Rtl,
   Sub,
   Top,
-  Visible,
-  Filled,
-  SwResize,
-  NoRepeat,
-  Default,
-  Transparent,
-  Ridge,
   Right,
-  HorizontalTb,
-  DistributeLetter,
-  DoubleCircle,
-  Ruby,
-  Collapse,
   Normal,
-  Avoid,
-  UpperRoman,
   Auto,
   Text,
   XSmall,
   Thin,
-  Repeat,
   Small,
-  NeResize,
-  NoContent,
-  Outside,
-  EResize,
-  TableRow,
   Bottom,
   Underline,
-  CjkIdeographic,
-  SeResize,
-  Fixed,
   Double,
-  Solid,
-  RubyBaseGroup,
-  OpenQuote,
   Lighter,
-  LowerRoman,
-  Strict,
-  TableCaption,
   Oblique,
-  Decimal,
-  Loose,
-  Hebrew,
-  Hidden,
-  Dashed,
-  Embed,
-  TableRowGroup,
-  TableColumn,
-  Static,
-  Outset,
-  DecimalLeadingZero,
-  KeepWords,
-  KatakanaIroha,
   Super,
   Center,
-  TableHeaderGroup,
-  Inside,
   XxLarge,
-  Triangle,
-  RubyTextGroup,
-  Circle,
-  Hiragana,
-  RepeatX,
-  RepeatY,
-  Move,
-  HiraganaIroha,
-  RubyBase,
-  Scroll,
   Smaller,
-  TableFooterGroup,
   Baseline,
-  Separate,
-  Armenian,
-  Open,
-  Relative,
   Thick,
   Justify,
   Middle,
-  Always,
-  DistributeSpace,
-  LineEdge,
-  PreWrap,
   Medium,
-  NResize,
   ListItem,
-  Show,
-  Currentcolor,
-  NoCloseQuote,
-  VerticalLr,
-  VerticalRl,
-  Pointer,
   XxSmall,
   Bold,
-  Both,
   SmallCaps,
-  Katakana,
-  After,
-  Horizontal,
-  Dotted,
-  Disc,
-  Georgian,
   Inline,
   Overline,
-  Wait,
-  BreakAll,
-  UpperAlpha,
-  Capitalize,
-  Nowrap,
   TextBottom,
-  NoOpenQuote,
-  Groove,
-  Progress,
   Larger,
-  CloseQuote,
-  TableCell,
-  PreLine,
-  Absolute,
   InlineTable,
-  BidiOverride,
   InlineBlock,
-  Inset,
-  Crosshair,
-  UpperLatin,
-  Help,
-  Hide,
-  Uppercase,
-  SResize,
-  Table,
   Blink,
   Block,
-  Start,
-  TableColumnGroup,
   Italic,
   LineThrough,
-  KeepAll,
-  LowerAlpha,
-  RunIn,
-  Square,
   XLarge,
   Large,
-  Before,
   Left,
   TextTop,
-  RubyText,
-  NoDisplay
+  LAST_MARKER
 };
 
 enum class FDE_CSSProperty : uint8_t {
-  WritingMode,
-  ColumnRuleWidth,
-  BorderLeft,
-  ColumnRule,
-  Height,
-  CounterReset,
-  Content,
-  RubyPosition,
-  BackgroundColor,
-  Width,
-  Src,
+  BorderLeft = 0,
   Top,
   Margin,
-  BorderColor,
-  Widows,
-  BorderBottomColor,
   TextIndent,
   Right,
-  TextEmphasisStyle,
   PaddingLeft,
-  ColumnWidth,
   MarginLeft,
   Border,
   BorderTop,
-  RubyOverhang,
-  PageBreakBefore,
-  MaxHeight,
-  MinWidth,
-  BorderLeftColor,
   Bottom,
-  Quotes,
-  MaxWidth,
   PaddingRight,
-  ListStyleImage,
-  WhiteSpace,
   BorderBottom,
-  ListStyleType,
-  WordBreak,
-  OverflowX,
-  OverflowY,
-  BorderTopColor,
   FontFamily,
-  Cursor,
-  RubyAlign,
-  ColumnRuleColor,
   FontWeight,
-  BorderRightStyle,
-  MinHeight,
   Color,
   LetterSpacing,
-  EmptyCells,
   TextAlign,
-  RubySpan,
-  Position,
-  BorderStyle,
-  BorderBottomStyle,
-  BorderCollapse,
-  ColumnCount,
   BorderRightWidth,
-  UnicodeBidi,
   VerticalAlign,
   PaddingTop,
-  Columns,
-  Overflow,
-  TableLayout,
   FontVariant,
-  ListStyle,
-  BackgroundPosition,
   BorderWidth,
-  TextEmphasisColor,
-  BorderLeftStyle,
-  PageBreakInside,
-  TextEmphasis,
   BorderBottomWidth,
-  ColumnGap,
-  Orphans,
   BorderRight,
   FontSize,
-  PageBreakAfter,
-  CaptionSide,
-  BackgroundRepeat,
-  BorderTopStyle,
   BorderSpacing,
-  TextTransform,
   FontStyle,
   Font,
   LineHeight,
   MarginRight,
-  Float,
   BorderLeftWidth,
   Display,
-  Clear,
-  ColumnRuleStyle,
-  TextCombine,
-  ListStylePosition,
-  Visibility,
   PaddingBottom,
-  BackgroundAttachment,
-  BackgroundImage,
-  LineBreak,
-  Background,
   BorderTopWidth,
   WordSpacing,
-  BorderRightColor,
-  CounterIncrement,
   Left,
   TextDecoration,
   Padding,
   MarginBottom,
   MarginTop,
-  Direction
+  LAST_MARKER
 };
 
 enum class FDE_CSSPseudo : uint8_t { After, Before, NONE };
@@ -512,12 +328,6 @@ class IFDE_CSSFontFaceRule : public IFDE_CSSRule {
 
 class IFDE_CSSStyleSheet : public IFX_Retainable {
  public:
-  static IFDE_CSSStyleSheet* LoadHTMLStandardStyleSheet();
-  static IFDE_CSSStyleSheet* LoadFromStream(
-      const CFX_WideString& szUrl,
-      const CFX_RetainPtr<IFGAS_Stream>& pStream,
-      uint16_t wCodePage,
-      uint32_t dwMediaList = FDE_CSSMEDIATYPE_ALL);
   static IFDE_CSSStyleSheet* LoadFromBuffer(
       const CFX_WideString& szUrl,
       const FX_WCHAR* pBuffer,