Split the XFA_OBJECTTYPE enum into two parts.

xfa/fxfa/parser/xfa_document_serialize.cpp

 // 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
 
 #include "xfa/fxfa/parser/xfa_document_serialize.h"
 
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
@@ skipping 143 matching lines @@
   }
   CXFA_Node* pFieldNode = pValueNode->GetNodeItem(XFA_NODEITEM_Parent);
   if (pFieldNode && pFieldNode->GetBindData() &&
       eAttribute == XFA_ATTRIBUTE_Href) {
     bSaveInDataModel = TRUE;
   }
   return bSaveInDataModel;
 }
 FX_BOOL XFA_DataExporter_ContentNodeNeedtoExport(CXFA_Node* pContentNode) {
   CFX_WideString wsContent;
-  if (!pContentNode->TryContent(wsContent, FALSE, FALSE)) {
+  if (!pContentNode->TryContent(wsContent, FALSE, FALSE))
     return FALSE;
-  }
-  ASSERT(pContentNode->GetObjectType() == XFA_OBJECTTYPE_ContentNode);
+
+  ASSERT(pContentNode->IsContentNode());
   CXFA_Node* pParentNode = pContentNode->GetNodeItem(XFA_NODEITEM_Parent);
-  if (!pParentNode || pParentNode->GetClassID() != XFA_ELEMENT_Value) {
+  if (!pParentNode || pParentNode->GetClassID() != XFA_ELEMENT_Value)
     return TRUE;
-  }
+
   CXFA_Node* pGrandParentNode = pParentNode->GetNodeItem(XFA_NODEITEM_Parent);
-  if (!pGrandParentNode ||
-      pGrandParentNode->GetObjectType() != XFA_OBJECTTYPE_ContainerNode) {
+  if (!pGrandParentNode || !pGrandParentNode->IsContainerNode())
     return TRUE;
-  }
-  if (pGrandParentNode->GetBindData()) {
+  if (pGrandParentNode->GetBindData())
     return FALSE;
-  }
+
   CXFA_WidgetData* pWidgetData = pGrandParentNode->GetWidgetData();
   XFA_ELEMENT eUIType = pWidgetData->GetUIType();
   if (eUIType == XFA_ELEMENT_PasswordEdit) {
     return FALSE;
   }
   return TRUE;
 }
 static void XFA_DataExporter_RecognizeXFAVersionNumber(
     CXFA_Node* pTemplateRoot,
     CFX_WideString& wsVersionNumber) {
@@ skipping 26 matching lines @@
         (XFA_DataExporter_AttributeSaveInDataModel(pNode, pAttr->eName) &&
          !bSaveXML)) {
       continue;
     }
     CFX_WideString wsAttr;
     XFA_SaveAttribute(pNode, pAttr->eName, pAttr->pName, bSaveXML, wsAttr);
     wsAttrs += wsAttr;
   }
   CFX_WideString wsChildren;
   switch (pNode->GetObjectType()) {
-    case XFA_OBJECTTYPE_ContentNode: {
+    case XFA_ObjectType::ContentNode: {
       if (!bSaveXML && !XFA_DataExporter_ContentNodeNeedtoExport(pNode)) {
         break;
       }
       CXFA_Node* pRawValueNode = pNode->GetNodeItem(XFA_NODEITEM_FirstChild);
       while (pRawValueNode &&
              pRawValueNode->GetClassID() != XFA_ELEMENT_SharpxHTML &&
              pRawValueNode->GetClassID() != XFA_ELEMENT_Sharptext &&
              pRawValueNode->GetClassID() != XFA_ELEMENT_Sharpxml) {
         pRawValueNode = pRawValueNode->GetNodeItem(XFA_NODEITEM_NextSibling);
       }
@@ skipping 64 matching lines @@
         buf << FX_WSTRC(L"</");
         buf << bodyTagName;
         buf << FX_WSTRC(L"\n>");
         wsChildren += buf.AsStringC();
         buf.Clear();
       } else {
         CFX_WideStringC wsValue = pRawValueNode->GetCData(XFA_ATTRIBUTE_Value);
         wsChildren += XFA_ExportEncodeContent(wsValue);
       }
     } break;
-    case XFA_OBJECTTYPE_TextNode:
-    case XFA_OBJECTTYPE_NodeC:
-    case XFA_OBJECTTYPE_NodeV: {
+    case XFA_ObjectType::TextNode:
+    case XFA_ObjectType::NodeC:
+    case XFA_ObjectType::NodeV: {
       CFX_WideStringC wsValue = pNode->GetCData(XFA_ATTRIBUTE_Value);
       wsChildren += XFA_ExportEncodeContent(wsValue);
     } break;
     default:
       if (pNode->GetClassID() == XFA_ELEMENT_Items) {
         CXFA_Node* pTemplateNode = pNode->GetTemplateNode();
         if (!pTemplateNode ||
             pTemplateNode->CountChildren(XFA_ELEMENT_UNKNOWN) !=
                 pNode->CountChildren(XFA_ELEMENT_UNKNOWN)) {
           bSaveXML = TRUE;
@@ skipping 94 matching lines @@
     pStream->WriteString(wsElement.c_str(), wsElement.GetLength());
     pStream->WriteString(L"\n>", 2);
   } else {
     pStream->WriteString(L"\n/>", 3);
   }
 }
 void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode,
                                          IFX_Stream* pStream,
                                          const FX_CHAR* pChecksum,
                                          FX_BOOL bSaveXML) {
-  if (pNode->GetObjectType() == XFA_OBJECTTYPE_ModelNode) {
+  if (pNode->IsModelNode()) {
     static const FX_WCHAR s_pwsTagName[] = L"<form";
     static const FX_WCHAR s_pwsClose[] = L"</form\n>";
     pStream->WriteString(s_pwsTagName, FXSYS_wcslen(s_pwsTagName));
     if (pChecksum) {
       static const FX_WCHAR s_pwChecksum[] = L" checksum=\"";
       CFX_WideString wsChecksum = CFX_WideString::FromUTF8(pChecksum);
       pStream->WriteString(s_pwChecksum, FXSYS_wcslen(s_pwChecksum));
       pStream->WriteString(wsChecksum.c_str(), wsChecksum.GetLength());
       pStream->WriteString(L"\"", 1);
     }
@@ skipping 44 matching lines @@
   pStream->SetCodePage(FX_CODEPAGE_UTF8);
   FX_BOOL bRet = Export(pStream, pNode, dwFlag, pChecksum);
   pStream->Release();
   return bRet;
 }
 FX_BOOL CXFA_DataExporter::Export(IFX_Stream* pStream,
                                   CXFA_Node* pNode,
                                   uint32_t dwFlag,
                                   const FX_CHAR* pChecksum) {
   CFDE_XMLDoc* pXMLDoc = m_pDocument->GetParser()->GetXMLDoc();
-  if (pNode->GetObjectType() == XFA_OBJECTTYPE_ModelNode) {
+  if (pNode->IsModelNode()) {
     switch (pNode->GetPacketID()) {
       case XFA_XDPPACKET_XDP: {
         static const FX_WCHAR s_pwsPreamble[] =
             L"<xdp:xdp xmlns:xdp=\"http://ns.adobe.com/xdp/\">";
         pStream->WriteString(s_pwsPreamble, FXSYS_wcslen(s_pwsPreamble));
         for (CXFA_Node* pChild = pNode->GetNodeItem(XFA_NODEITEM_FirstChild);
              pChild; pChild = pChild->GetNodeItem(XFA_NODEITEM_NextSibling)) {
           Export(pStream, pChild, dwFlag, pChecksum);
         }
         static const FX_WCHAR s_pwsPostamble[] = L"</xdp:xdp\n>";
@@ skipping 68 matching lines @@
         pXMLElement->RemoveAttribute(L"xfa:dataNode");
       }
     } else {
       CFDE_XMLNode* pXMLNode = pDataNode->GetXMLMappingNode();
       ASSERT(pXMLNode->GetType() == FDE_XMLNODE_Element);
       static_cast<CFDE_XMLElement*>(pXMLNode)->SetString(L"xfa:dataNode",
                                                          L"dataGroup");
     }
   }
 }