Split the XFA_OBJECTTYPE enum into two parts.

xfa/fxfa/parser/xfa_document_imp.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 "core/fxcrt/include/fx_ext.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/xfa_basic_imp.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
@@ skipping 274 matching lines @@
 static void XFA_ProtoMerge_MergeNodeRecurse(CXFA_Document* pDocument,
                                             CXFA_Node* pDestNodeParent,
                                             CXFA_Node* pProtoNode) {
   CXFA_Node* pExistingNode = NULL;
   for (CXFA_Node* pFormChild =
            pDestNodeParent->GetNodeItem(XFA_NODEITEM_FirstChild);
        pFormChild;
        pFormChild = pFormChild->GetNodeItem(XFA_NODEITEM_NextSibling)) {
     if (pFormChild->GetClassID() == pProtoNode->GetClassID() &&
         pFormChild->GetNameHash() == pProtoNode->GetNameHash() &&
-        pFormChild->HasFlag(XFA_NODEFLAG_UnusedNode)) {
-      pFormChild->ClearFlag(XFA_NODEFLAG_UnusedNode);
+        pFormChild->IsUnusedNode()) {
+      pFormChild->ClearFlag(XFA_NodeFlag_UnusedNode);
       pExistingNode = pFormChild;
       break;
     }
   }
   if (pExistingNode) {
     pExistingNode->SetTemplateNode(pProtoNode);
     for (CXFA_Node* pTemplateChild =
              pProtoNode->GetNodeItem(XFA_NODEITEM_FirstChild);
          pTemplateChild; pTemplateChild = pTemplateChild->GetNodeItem(
                              XFA_NODEITEM_NextSibling)) {
       XFA_ProtoMerge_MergeNodeRecurse(pDocument, pExistingNode, pTemplateChild);
     }
     return;
   }
   CXFA_Node* pNewNode = pProtoNode->Clone(TRUE);
   pNewNode->SetTemplateNode(pProtoNode);
   pDestNodeParent->InsertChild(pNewNode, NULL);
 }
 static void XFA_ProtoMerge_MergeNode(CXFA_Document* pDocument,
                                      CXFA_Node* pDestNode,
                                      CXFA_Node* pProtoNode) {
   {
     CXFA_NodeIterator sIterator(pDestNode);
     for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode;
          pNode = sIterator.MoveToNext()) {
-      pNode->SetFlag(XFA_NODEFLAG_UnusedNode, true);
+      pNode->SetFlag(XFA_NodeFlag_UnusedNode, true);
     }
   }
   pDestNode->SetTemplateNode(pProtoNode);
   for (CXFA_Node* pTemplateChild =
            pProtoNode->GetNodeItem(XFA_NODEITEM_FirstChild);
        pTemplateChild;
        pTemplateChild = pTemplateChild->GetNodeItem(XFA_NODEITEM_NextSibling)) {
     XFA_ProtoMerge_MergeNodeRecurse(pDocument, pDestNode, pTemplateChild);
   }
   {
     CXFA_NodeIterator sIterator(pDestNode);
     for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode;
          pNode = sIterator.MoveToNext()) {
-      pNode->ClearFlag(XFA_NODEFLAG_UnusedNode);
+      pNode->ClearFlag(XFA_NodeFlag_UnusedNode);
     }
   }
 }
 void CXFA_Document::DoProtoMerge() {
   CXFA_Node* pTemplateRoot = ToNode(GetXFAObject(XFA_HASHCODE_Template));
   if (!pTemplateRoot) {
     return;
   }
   CFX_MapPtrTemplate<uint32_t, CXFA_Node*> mIDMap;
   CXFA_NodeSet sUseNodes;
@@ skipping 60 matching lines @@
       if (!mIDMap.Lookup(FX_HashCode_GetW(wsID, false), pProtoNode)) {
         continue;
       }
     }
     if (!pProtoNode) {
       continue;
     }
     XFA_ProtoMerge_MergeNode(this, pUseHrefNode, pProtoNode);
   }
 }