Convert XFA_ELEMENT to an enum class

This CL changes XFA_ELEMENT From an enum to an enum class. The type name was
updated to XFA_Element.

Review-Url: https://codereview.chromium.org/2089443002

4 files changed, 339 insertions, 337 deletions

diff --git a/xfa/fxfa/include/fxfa_basic.h b/xfa/fxfa/include/fxfa_basic.h
index 215b2e657a..51d81cd157 100644
--- a/xfa/fxfa/include/fxfa_basic.h
+++ b/xfa/fxfa/include/fxfa_basic.h
@@ -613,331 +613,333 @@ enum XFA_ATTRIBUTE {
   XFA_ATTRIBUTE_XdpContent,
   XFA_ATTRIBUTE_DecipherOnly,
 };
-enum XFA_ELEMENT {
-  XFA_ELEMENT_Ps,
-  XFA_ELEMENT_To,
-  XFA_ELEMENT_Ui,
-  XFA_ELEMENT_RecordSet,
-  XFA_ELEMENT_SubsetBelow,
-  XFA_ELEMENT_SubformSet,
-  XFA_ELEMENT_AdobeExtensionLevel,
-  XFA_ELEMENT_Typeface,
-  XFA_ELEMENT_Break,
-  XFA_ELEMENT_FontInfo,
-  XFA_ELEMENT_NumberPattern,
-  XFA_ELEMENT_DynamicRender,
-  XFA_ELEMENT_PrintScaling,
-  XFA_ELEMENT_CheckButton,
-  XFA_ELEMENT_DatePatterns,
-  XFA_ELEMENT_SourceSet,
-  XFA_ELEMENT_Amd,
-  XFA_ELEMENT_Arc,
-  XFA_ELEMENT_Day,
-  XFA_ELEMENT_Era,
-  XFA_ELEMENT_Jog,
-  XFA_ELEMENT_Log,
-  XFA_ELEMENT_Map,
-  XFA_ELEMENT_Mdp,
-  XFA_ELEMENT_BreakBefore,
-  XFA_ELEMENT_Oid,
-  XFA_ELEMENT_Pcl,
-  XFA_ELEMENT_Pdf,
-  XFA_ELEMENT_Ref,
-  XFA_ELEMENT_Uri,
-  XFA_ELEMENT_Xdc,
-  XFA_ELEMENT_Xdp,
-  XFA_ELEMENT_Xfa,
-  XFA_ELEMENT_Xsl,
-  XFA_ELEMENT_Zpl,
-  XFA_ELEMENT_Cache,
-  XFA_ELEMENT_Margin,
-  XFA_ELEMENT_KeyUsage,
-  XFA_ELEMENT_Exclude,
-  XFA_ELEMENT_ChoiceList,
-  XFA_ELEMENT_Level,
-  XFA_ELEMENT_LabelPrinter,
-  XFA_ELEMENT_CalendarSymbols,
-  XFA_ELEMENT_Para,
-  XFA_ELEMENT_Part,
-  XFA_ELEMENT_Pdfa,
-  XFA_ELEMENT_Filter,
-  XFA_ELEMENT_Present,
-  XFA_ELEMENT_Pagination,
-  XFA_ELEMENT_Encoding,
-  XFA_ELEMENT_Event,
-  XFA_ELEMENT_Whitespace,
-  XFA_ELEMENT_DefaultUi,
-  XFA_ELEMENT_DataModel,
-  XFA_ELEMENT_Barcode,
-  XFA_ELEMENT_TimePattern,
-  XFA_ELEMENT_BatchOutput,
-  XFA_ELEMENT_Enforce,
-  XFA_ELEMENT_CurrencySymbols,
-  XFA_ELEMENT_AddSilentPrint,
-  XFA_ELEMENT_Rename,
-  XFA_ELEMENT_Operation,
-  XFA_ELEMENT_Typefaces,
-  XFA_ELEMENT_SubjectDNs,
-  XFA_ELEMENT_Issuers,
-  XFA_ELEMENT_SignaturePseudoModel,
-  XFA_ELEMENT_WsdlConnection,
-  XFA_ELEMENT_Debug,
-  XFA_ELEMENT_Delta,
-  XFA_ELEMENT_EraNames,
-  XFA_ELEMENT_ModifyAnnots,
-  XFA_ELEMENT_StartNode,
-  XFA_ELEMENT_Button,
-  XFA_ELEMENT_Format,
-  XFA_ELEMENT_Border,
-  XFA_ELEMENT_Area,
-  XFA_ELEMENT_Hyphenation,
-  XFA_ELEMENT_Text,
-  XFA_ELEMENT_Time,
-  XFA_ELEMENT_Type,
-  XFA_ELEMENT_Overprint,
-  XFA_ELEMENT_Certificates,
-  XFA_ELEMENT_EncryptionMethods,
-  XFA_ELEMENT_SetProperty,
-  XFA_ELEMENT_PrinterName,
-  XFA_ELEMENT_StartPage,
-  XFA_ELEMENT_PageOffset,
-  XFA_ELEMENT_DateTime,
-  XFA_ELEMENT_Comb,
-  XFA_ELEMENT_Pattern,
-  XFA_ELEMENT_IfEmpty,
-  XFA_ELEMENT_SuppressBanner,
-  XFA_ELEMENT_OutputBin,
-  XFA_ELEMENT_Field,
-  XFA_ELEMENT_Agent,
-  XFA_ELEMENT_OutputXSL,
-  XFA_ELEMENT_AdjustData,
-  XFA_ELEMENT_AutoSave,
-  XFA_ELEMENT_ContentArea,
-  XFA_ELEMENT_EventPseudoModel,
-  XFA_ELEMENT_WsdlAddress,
-  XFA_ELEMENT_Solid,
-  XFA_ELEMENT_DateTimeSymbols,
-  XFA_ELEMENT_EncryptionLevel,
-  XFA_ELEMENT_Edge,
-  XFA_ELEMENT_Stipple,
-  XFA_ELEMENT_Attributes,
-  XFA_ELEMENT_VersionControl,
-  XFA_ELEMENT_Meridiem,
-  XFA_ELEMENT_ExclGroup,
-  XFA_ELEMENT_ToolTip,
-  XFA_ELEMENT_Compress,
-  XFA_ELEMENT_Reason,
-  XFA_ELEMENT_Execute,
-  XFA_ELEMENT_ContentCopy,
-  XFA_ELEMENT_DateTimeEdit,
-  XFA_ELEMENT_Config,
-  XFA_ELEMENT_Image,
-  XFA_ELEMENT_SharpxHTML,
-  XFA_ELEMENT_NumberOfCopies,
-  XFA_ELEMENT_BehaviorOverride,
-  XFA_ELEMENT_TimeStamp,
-  XFA_ELEMENT_Month,
-  XFA_ELEMENT_ViewerPreferences,
-  XFA_ELEMENT_ScriptModel,
-  XFA_ELEMENT_Decimal,
-  XFA_ELEMENT_Subform,
-  XFA_ELEMENT_Select,
-  XFA_ELEMENT_Window,
-  XFA_ELEMENT_LocaleSet,
-  XFA_ELEMENT_Handler,
-  XFA_ELEMENT_HostPseudoModel,
-  XFA_ELEMENT_Presence,
-  XFA_ELEMENT_Record,
-  XFA_ELEMENT_Embed,
-  XFA_ELEMENT_Version,
-  XFA_ELEMENT_Command,
-  XFA_ELEMENT_Copies,
-  XFA_ELEMENT_Staple,
-  XFA_ELEMENT_SubmitFormat,
-  XFA_ELEMENT_Boolean,
-  XFA_ELEMENT_Message,
-  XFA_ELEMENT_Output,
-  XFA_ELEMENT_PsMap,
-  XFA_ELEMENT_ExcludeNS,
-  XFA_ELEMENT_Assist,
-  XFA_ELEMENT_Picture,
-  XFA_ELEMENT_Traversal,
-  XFA_ELEMENT_SilentPrint,
-  XFA_ELEMENT_WebClient,
-  XFA_ELEMENT_LayoutPseudoModel,
-  XFA_ELEMENT_Producer,
-  XFA_ELEMENT_Corner,
-  XFA_ELEMENT_MsgId,
-  XFA_ELEMENT_Color,
-  XFA_ELEMENT_Keep,
-  XFA_ELEMENT_Query,
-  XFA_ELEMENT_Insert,
-  XFA_ELEMENT_ImageEdit,
-  XFA_ELEMENT_Validate,
-  XFA_ELEMENT_DigestMethods,
-  XFA_ELEMENT_NumberPatterns,
-  XFA_ELEMENT_PageSet,
-  XFA_ELEMENT_Integer,
-  XFA_ELEMENT_SoapAddress,
-  XFA_ELEMENT_Equate,
-  XFA_ELEMENT_FormFieldFilling,
-  XFA_ELEMENT_PageRange,
-  XFA_ELEMENT_Update,
-  XFA_ELEMENT_ConnectString,
-  XFA_ELEMENT_Mode,
-  XFA_ELEMENT_Layout,
-  XFA_ELEMENT_Sharpxml,
-  XFA_ELEMENT_XsdConnection,
-  XFA_ELEMENT_Traverse,
-  XFA_ELEMENT_Encodings,
-  XFA_ELEMENT_Template,
-  XFA_ELEMENT_Acrobat,
-  XFA_ELEMENT_ValidationMessaging,
-  XFA_ELEMENT_Signing,
-  XFA_ELEMENT_DataWindow,
-  XFA_ELEMENT_Script,
-  XFA_ELEMENT_AddViewerPreferences,
-  XFA_ELEMENT_AlwaysEmbed,
-  XFA_ELEMENT_PasswordEdit,
-  XFA_ELEMENT_NumericEdit,
-  XFA_ELEMENT_EncryptionMethod,
-  XFA_ELEMENT_Change,
-  XFA_ELEMENT_PageArea,
-  XFA_ELEMENT_SubmitUrl,
-  XFA_ELEMENT_Oids,
-  XFA_ELEMENT_Signature,
-  XFA_ELEMENT_ADBE_JSConsole,
-  XFA_ELEMENT_Caption,
-  XFA_ELEMENT_Relevant,
-  XFA_ELEMENT_FlipLabel,
-  XFA_ELEMENT_ExData,
-  XFA_ELEMENT_DayNames,
-  XFA_ELEMENT_SoapAction,
-  XFA_ELEMENT_DefaultTypeface,
-  XFA_ELEMENT_Manifest,
-  XFA_ELEMENT_Overflow,
-  XFA_ELEMENT_Linear,
-  XFA_ELEMENT_CurrencySymbol,
-  XFA_ELEMENT_Delete,
-  XFA_ELEMENT_Deltas,
-  XFA_ELEMENT_DigestMethod,
-  XFA_ELEMENT_InstanceManager,
-  XFA_ELEMENT_EquateRange,
-  XFA_ELEMENT_Medium,
-  XFA_ELEMENT_TextEdit,
-  XFA_ELEMENT_TemplateCache,
-  XFA_ELEMENT_CompressObjectStream,
-  XFA_ELEMENT_DataValue,
-  XFA_ELEMENT_AccessibleContent,
-  XFA_ELEMENT_NodeList,
-  XFA_ELEMENT_IncludeXDPContent,
-  XFA_ELEMENT_XmlConnection,
-  XFA_ELEMENT_ValidateApprovalSignatures,
-  XFA_ELEMENT_SignData,
-  XFA_ELEMENT_Packets,
-  XFA_ELEMENT_DatePattern,
-  XFA_ELEMENT_DuplexOption,
-  XFA_ELEMENT_Base,
-  XFA_ELEMENT_Bind,
-  XFA_ELEMENT_Compression,
-  XFA_ELEMENT_User,
-  XFA_ELEMENT_Rectangle,
-  XFA_ELEMENT_EffectiveOutputPolicy,
-  XFA_ELEMENT_ADBE_JSDebugger,
-  XFA_ELEMENT_Acrobat7,
-  XFA_ELEMENT_Interactive,
-  XFA_ELEMENT_Locale,
-  XFA_ELEMENT_CurrentPage,
-  XFA_ELEMENT_Data,
-  XFA_ELEMENT_Date,
-  XFA_ELEMENT_Desc,
-  XFA_ELEMENT_Encrypt,
-  XFA_ELEMENT_Draw,
-  XFA_ELEMENT_Encryption,
-  XFA_ELEMENT_MeridiemNames,
-  XFA_ELEMENT_Messaging,
-  XFA_ELEMENT_Speak,
-  XFA_ELEMENT_DataGroup,
-  XFA_ELEMENT_Common,
-  XFA_ELEMENT_Sharptext,
-  XFA_ELEMENT_PaginationOverride,
-  XFA_ELEMENT_Reasons,
-  XFA_ELEMENT_SignatureProperties,
-  XFA_ELEMENT_Threshold,
-  XFA_ELEMENT_AppearanceFilter,
-  XFA_ELEMENT_Fill,
-  XFA_ELEMENT_Font,
-  XFA_ELEMENT_Form,
-  XFA_ELEMENT_MediumInfo,
-  XFA_ELEMENT_Certificate,
-  XFA_ELEMENT_Password,
-  XFA_ELEMENT_RunScripts,
-  XFA_ELEMENT_Trace,
-  XFA_ELEMENT_Float,
-  XFA_ELEMENT_RenderPolicy,
-  XFA_ELEMENT_LogPseudoModel,
-  XFA_ELEMENT_Destination,
-  XFA_ELEMENT_Value,
-  XFA_ELEMENT_Bookend,
-  XFA_ELEMENT_ExObject,
-  XFA_ELEMENT_OpenAction,
-  XFA_ELEMENT_NeverEmbed,
-  XFA_ELEMENT_BindItems,
-  XFA_ELEMENT_Calculate,
-  XFA_ELEMENT_Print,
-  XFA_ELEMENT_Extras,
-  XFA_ELEMENT_Proto,
-  XFA_ELEMENT_DSigData,
-  XFA_ELEMENT_Creator,
-  XFA_ELEMENT_Connect,
-  XFA_ELEMENT_Permissions,
-  XFA_ELEMENT_ConnectionSet,
-  XFA_ELEMENT_Submit,
-  XFA_ELEMENT_Range,
-  XFA_ELEMENT_Linearized,
-  XFA_ELEMENT_Packet,
-  XFA_ELEMENT_RootElement,
-  XFA_ELEMENT_PlaintextMetadata,
-  XFA_ELEMENT_NumberSymbols,
-  XFA_ELEMENT_PrintHighQuality,
-  XFA_ELEMENT_Driver,
-  XFA_ELEMENT_IncrementalLoad,
-  XFA_ELEMENT_SubjectDN,
-  XFA_ELEMENT_CompressLogicalStructure,
-  XFA_ELEMENT_IncrementalMerge,
-  XFA_ELEMENT_Radial,
-  XFA_ELEMENT_Variables,
-  XFA_ELEMENT_TimePatterns,
-  XFA_ELEMENT_EffectiveInputPolicy,
-  XFA_ELEMENT_NameAttr,
-  XFA_ELEMENT_Conformance,
-  XFA_ELEMENT_Transform,
-  XFA_ELEMENT_LockDocument,
-  XFA_ELEMENT_BreakAfter,
-  XFA_ELEMENT_Line,
-  XFA_ELEMENT_List,
-  XFA_ELEMENT_Source,
-  XFA_ELEMENT_Occur,
-  XFA_ELEMENT_PickTrayByPDFSize,
-  XFA_ELEMENT_MonthNames,
-  XFA_ELEMENT_Severity,
-  XFA_ELEMENT_GroupParent,
-  XFA_ELEMENT_DocumentAssembly,
-  XFA_ELEMENT_NumberSymbol,
-  XFA_ELEMENT_Tagged,
-  XFA_ELEMENT_Items,
+
+enum class XFA_Element : int32_t {
+  Unknown = -1,
+
+  Ps,
+  To,
+  Ui,
+  RecordSet,
+  SubsetBelow,
+  SubformSet,
+  AdobeExtensionLevel,
+  Typeface,
+  Break,
+  FontInfo,
+  NumberPattern,
+  DynamicRender,
+  PrintScaling,
+  CheckButton,
+  DatePatterns,
+  SourceSet,
+  Amd,
+  Arc,
+  Day,
+  Era,
+  Jog,
+  Log,
+  Map,
+  Mdp,
+  BreakBefore,
+  Oid,
+  Pcl,
+  Pdf,
+  Ref,
+  Uri,
+  Xdc,
+  Xdp,
+  Xfa,
+  Xsl,
+  Zpl,
+  Cache,
+  Margin,
+  KeyUsage,
+  Exclude,
+  ChoiceList,
+  Level,
+  LabelPrinter,
+  CalendarSymbols,
+  Para,
+  Part,
+  Pdfa,
+  Filter,
+  Present,
+  Pagination,
+  Encoding,
+  Event,
+  Whitespace,
+  DefaultUi,
+  DataModel,
+  Barcode,
+  TimePattern,
+  BatchOutput,
+  Enforce,
+  CurrencySymbols,
+  AddSilentPrint,
+  Rename,
+  Operation,
+  Typefaces,
+  SubjectDNs,
+  Issuers,
+  SignaturePseudoModel,
+  WsdlConnection,
+  Debug,
+  Delta,
+  EraNames,
+  ModifyAnnots,
+  StartNode,
+  Button,
+  Format,
+  Border,
+  Area,
+  Hyphenation,
+  Text,
+  Time,
+  Type,
+  Overprint,
+  Certificates,
+  EncryptionMethods,
+  SetProperty,
+  PrinterName,
+  StartPage,
+  PageOffset,
+  DateTime,
+  Comb,
+  Pattern,
+  IfEmpty,
+  SuppressBanner,
+  OutputBin,
+  Field,
+  Agent,
+  OutputXSL,
+  AdjustData,
+  AutoSave,
+  ContentArea,
+  EventPseudoModel,
+  WsdlAddress,
+  Solid,
+  DateTimeSymbols,
+  EncryptionLevel,
+  Edge,
+  Stipple,
+  Attributes,
+  VersionControl,
+  Meridiem,
+  ExclGroup,
+  ToolTip,
+  Compress,
+  Reason,
+  Execute,
+  ContentCopy,
+  DateTimeEdit,
+  Config,
+  Image,
+  SharpxHTML,
+  NumberOfCopies,
+  BehaviorOverride,
+  TimeStamp,
+  Month,
+  ViewerPreferences,
+  ScriptModel,
+  Decimal,
+  Subform,
+  Select,
+  Window,
+  LocaleSet,
+  Handler,
+  HostPseudoModel,
+  Presence,
+  Record,
+  Embed,
+  Version,
+  Command,
+  Copies,
+  Staple,
+  SubmitFormat,
+  Boolean,
+  Message,
+  Output,
+  PsMap,
+  ExcludeNS,
+  Assist,
+  Picture,
+  Traversal,
+  SilentPrint,
+  WebClient,
+  LayoutPseudoModel,
+  Producer,
+  Corner,
+  MsgId,
+  Color,
+  Keep,
+  Query,
+  Insert,
+  ImageEdit,
+  Validate,
+  DigestMethods,
+  NumberPatterns,
+  PageSet,
+  Integer,
+  SoapAddress,
+  Equate,
+  FormFieldFilling,
+  PageRange,
+  Update,
+  ConnectString,
+  Mode,
+  Layout,
+  Sharpxml,
+  XsdConnection,
+  Traverse,
+  Encodings,
+  Template,
+  Acrobat,
+  ValidationMessaging,
+  Signing,
+  DataWindow,
+  Script,
+  AddViewerPreferences,
+  AlwaysEmbed,
+  PasswordEdit,
+  NumericEdit,
+  EncryptionMethod,
+  Change,
+  PageArea,
+  SubmitUrl,
+  Oids,
+  Signature,
+  ADBE_JSConsole,
+  Caption,
+  Relevant,
+  FlipLabel,
+  ExData,
+  DayNames,
+  SoapAction,
+  DefaultTypeface,
+  Manifest,
+  Overflow,
+  Linear,
+  CurrencySymbol,
+  Delete,
+  Deltas,
+  DigestMethod,
+  InstanceManager,
+  EquateRange,
+  Medium,
+  TextEdit,
+  TemplateCache,
+  CompressObjectStream,
+  DataValue,
+  AccessibleContent,
+  NodeList,
+  IncludeXDPContent,
+  XmlConnection,
+  ValidateApprovalSignatures,
+  SignData,
+  Packets,
+  DatePattern,
+  DuplexOption,
+  Base,
+  Bind,
+  Compression,
+  User,
+  Rectangle,
+  EffectiveOutputPolicy,
+  ADBE_JSDebugger,
+  Acrobat7,
+  Interactive,
+  Locale,
+  CurrentPage,
+  Data,
+  Date,
+  Desc,
+  Encrypt,
+  Draw,
+  Encryption,
+  MeridiemNames,
+  Messaging,
+  Speak,
+  DataGroup,
+  Common,
+  Sharptext,
+  PaginationOverride,
+  Reasons,
+  SignatureProperties,
+  Threshold,
+  AppearanceFilter,
+  Fill,
+  Font,
+  Form,
+  MediumInfo,
+  Certificate,
+  Password,
+  RunScripts,
+  Trace,
+  Float,
+  RenderPolicy,
+  LogPseudoModel,
+  Destination,
+  Value,
+  Bookend,
+  ExObject,
+  OpenAction,
+  NeverEmbed,
+  BindItems,
+  Calculate,
+  Print,
+  Extras,
+  Proto,
+  DSigData,
+  Creator,
+  Connect,
+  Permissions,
+  ConnectionSet,
+  Submit,
+  Range,
+  Linearized,
+  Packet,
+  RootElement,
+  PlaintextMetadata,
+  NumberSymbols,
+  PrintHighQuality,
+  Driver,
+  IncrementalLoad,
+  SubjectDN,
+  CompressLogicalStructure,
+  IncrementalMerge,
+  Radial,
+  Variables,
+  TimePatterns,
+  EffectiveInputPolicy,
+  NameAttr,
+  Conformance,
+  Transform,
+  LockDocument,
+  BreakAfter,
+  Line,
+  List,
+  Source,
+  Occur,
+  PickTrayByPDFSize,
+  MonthNames,
+  Severity,
+  GroupParent,
+  DocumentAssembly,
+  NumberSymbol,
+  Tagged,
+  Items
 };
-#define XFA_ELEMENT_UNKNOWN ((XFA_ELEMENT)-1)
 struct XFA_ELEMENTINFO {
   uint32_t uHash;
   const FX_WCHAR* pName;
-  XFA_ELEMENT eName;
+  XFA_Element eName;
   uint32_t dwPackets;
   XFA_ObjectType eObjectType;
 };
 
 const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName);
-const XFA_ELEMENTINFO* XFA_GetElementByID(XFA_ELEMENT eName);
+const XFA_ELEMENTINFO* XFA_GetElementByID(XFA_Element eName);
 
 enum XFA_ATTRIBUTETYPE {
   XFA_ATTRIBUTETYPE_NOTSURE,
@@ -959,20 +961,20 @@ struct XFA_ATTRIBUTEINFO {
 const XFA_ATTRIBUTEINFO* XFA_GetAttributeByName(const CFX_WideStringC& wsName);
 const XFA_ATTRIBUTEINFO* XFA_GetAttributeByID(XFA_ATTRIBUTE eName);
 FX_BOOL XFA_GetAttributeDefaultValue(void*& pValue,
-                                     XFA_ELEMENT eElement,
+                                     XFA_Element eElement,
                                      XFA_ATTRIBUTE eAttribute,
                                      XFA_ATTRIBUTETYPE eType,
                                      uint32_t dwPacket);
-XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement,
+XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_Element eElement,
                                                     XFA_ATTRIBUTE eAttribute,
                                                     uint32_t dwPacket);
-CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement,
+CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_Element eElement,
                                                    XFA_ATTRIBUTE eAttribute,
                                                    uint32_t dwPacket);
-FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement,
+FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_Element eElement,
                                              XFA_ATTRIBUTE eAttribute,
                                              uint32_t dwPacket);
-CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement,
+CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_Element eElement,
                                                       XFA_ATTRIBUTE eAttribute,
                                                       uint32_t dwPacket);
 struct XFA_ELEMENTHIERARCHY {
@@ -988,22 +990,22 @@ struct XFA_SCRIPTHIERARCHY {
   int16_t wParentIndex;
 };
 
-const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t& iCount);
+const uint8_t* XFA_GetElementAttributes(XFA_Element eElement, int32_t& iCount);
 
-const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement,
+const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_Element eElement,
                                                    XFA_ATTRIBUTE eAttribute,
                                                    uint32_t dwPacket);
 #define XFA_PROPERTYFLAG_OneOf 0x01
 #define XFA_PROPERTYFLAG_DefaultOneOf 0x02
 struct XFA_PROPERTY {
-  uint16_t eName;
+  XFA_Element eName;
   uint8_t uOccur;
   uint8_t uFlags;
 };
-const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement,
+const XFA_PROPERTY* XFA_GetElementProperties(XFA_Element eElement,
                                              int32_t& iCount);
-const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement,
-                                             XFA_ELEMENT eProperty,
+const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_Element eElement,
+                                             XFA_Element eProperty,
                                              uint32_t dwPacket);
 struct XFA_ATTRIBUTEENUMINFO {
   uint32_t uHash;
@@ -1061,7 +1063,7 @@ struct XFA_METHODINFO {
   XFA_METHOD_CALLBACK lpfnCallback;
 };
 
-const XFA_METHODINFO* XFA_GetMethodByName(XFA_ELEMENT eElement,
+const XFA_METHODINFO* XFA_GetMethodByName(XFA_Element eElement,
                                           const CFX_WideStringC& wsMethodName);
 typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK)(CFXJSE_Value* pValue,
                                                     FX_BOOL bSetting,
@@ -1078,7 +1080,7 @@ struct XFA_SCRIPTATTRIBUTEINFO {
   uint16_t eValueType;
 };
 const XFA_SCRIPTATTRIBUTEINFO* XFA_GetScriptAttributeByName(
-    XFA_ELEMENT eElement,
+    XFA_Element eElement,
     const CFX_WideStringC& wsAttributeName);
 
 #endif  // XFA_FXFA_INCLUDE_FXFA_BASIC_H_
diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h
index a8bed176ab..cf52bbe205 100644
--- a/xfa/fxfa/include/fxfa_widget.h
+++ b/xfa/fxfa/include/fxfa_widget.h
@@ -109,7 +109,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData {
   FX_FLOAT GetWidthWithoutMargin(FX_FLOAT fWidthCalc);
   FX_FLOAT GetHeightWithoutMargin(FX_FLOAT fHeightCalc);
   void CalculateTextContentSize(CFX_SizeF& size);
-  void CalculateAccWidthAndHeight(XFA_ELEMENT eUIType,
+  void CalculateAccWidthAndHeight(XFA_Element eUIType,
                                   FX_FLOAT& fWidth,
                                   FX_FLOAT& fCalcHeight);
   void InitLayoutData();
diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h
index 4512cdf5a2..9d337d7fbe 100644
--- a/xfa/fxfa/include/xfa_ffwidget.h
+++ b/xfa/fxfa/include/xfa_ffwidget.h
@@ -174,7 +174,7 @@ void XFA_RectWidthoutMargin(CFX_RectF& rt,
                             const CXFA_Margin& mg,
                             FX_BOOL bUI = FALSE);
 CXFA_FFWidget* XFA_GetWidgetFromLayoutItem(CXFA_LayoutItem* pLayoutItem);
-FX_BOOL XFA_IsCreateWidget(XFA_ELEMENT iType);
+FX_BOOL XFA_IsCreateWidget(XFA_Element iType);
 #define XFA_DRAWBOX_ForceRound 1
 #define XFA_DRAWBOX_Lowered3D 2
 void XFA_DrawBox(CXFA_Box box,
diff --git a/xfa/fxfa/include/xfa_ffwidgethandler.h b/xfa/fxfa/include/xfa_ffwidgethandler.h
index cc6d048619..4aa86d21f0 100644
--- a/xfa/fxfa/include/xfa_ffwidgethandler.h
+++ b/xfa/fxfa/include/xfa_ffwidgethandler.h
@@ -93,7 +93,7 @@ class CXFA_FFWidgetHandler {
   CXFA_Node* CreateListBox(CXFA_Node* pParent, CXFA_Node* pBefore) const;
   CXFA_Node* CreateImageField(CXFA_Node* pParent, CXFA_Node* pBefore) const;
   CXFA_Node* CreatePasswordEdit(CXFA_Node* pParent, CXFA_Node* pBefore) const;
-  CXFA_Node* CreateField(XFA_ELEMENT eElement,
+  CXFA_Node* CreateField(XFA_Element eElement,
                          CXFA_Node* pParent,
                          CXFA_Node* pBefore) const;
   CXFA_Node* CreateArc(CXFA_Node* pParent, CXFA_Node* pBefore) const;
@@ -101,25 +101,25 @@ class CXFA_FFWidgetHandler {
   CXFA_Node* CreateImage(CXFA_Node* pParent, CXFA_Node* pBefore) const;
   CXFA_Node* CreateLine(CXFA_Node* pParent, CXFA_Node* pBefore) const;
   CXFA_Node* CreateText(CXFA_Node* pParent, CXFA_Node* pBefore) const;
-  CXFA_Node* CreateDraw(XFA_ELEMENT eElement,
+  CXFA_Node* CreateDraw(XFA_Element eElement,
                         CXFA_Node* pParent,
                         CXFA_Node* pBefore) const;
 
   CXFA_Node* CreateSubform(CXFA_Node* pParent, CXFA_Node* pBefore) const;
-  CXFA_Node* CreateFormItem(XFA_ELEMENT eElement,
+  CXFA_Node* CreateFormItem(XFA_Element eElement,
                             CXFA_Node* pParent,
                             CXFA_Node* pBefore) const;
-  CXFA_Node* CreateCopyNode(XFA_ELEMENT eElement,
+  CXFA_Node* CreateCopyNode(XFA_Element eElement,
                             CXFA_Node* pParent,
                             CXFA_Node* pBefore = NULL) const;
-  CXFA_Node* CreateTemplateNode(XFA_ELEMENT eElement,
+  CXFA_Node* CreateTemplateNode(XFA_Element eElement,
                                 CXFA_Node* pParent,
                                 CXFA_Node* pBefore) const;
   CXFA_Node* CreateFontNode(CXFA_Node* pParent) const;
   CXFA_Node* CreateMarginNode(CXFA_Node* pParent,
                               uint32_t dwFlags,
                               FX_FLOAT fInsets[4]) const;
-  CXFA_Node* CreateValueNode(XFA_ELEMENT eValue, CXFA_Node* pParent) const;
+  CXFA_Node* CreateValueNode(XFA_Element eValue, CXFA_Node* pParent) const;
   CXFA_Document* GetObjFactory() const;
   CXFA_Document* GetXFADoc() const;