Split the XFA_OBJECTTYPE enum into two parts.

xfa/fxfa/app/xfa_ffwidgetacc.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/app/xfa_ffwidgetacc.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 196 matching lines @@
       CFX_WideString wsContentType, wsHref;
       if (image) {
         image.GetContent(wsValue);
         image.GetContentType(wsContentType);
         image.GetHref(wsHref);
       }
       SetImageEdit(wsContentType, wsHref, wsValue);
     } break;
     case XFA_ELEMENT_ExclGroup: {
       CXFA_Node* pNextChild = m_pNode->GetNodeItem(
-          XFA_NODEITEM_FirstChild, XFA_OBJECTTYPE_ContainerNode);
+          XFA_NODEITEM_FirstChild, XFA_ObjectType::ContainerNode);
       while (pNextChild) {
         CXFA_Node* pChild = pNextChild;
         CXFA_WidgetAcc* pAcc =
             static_cast<CXFA_WidgetAcc*>(pChild->GetWidgetData());
         if (!pAcc) {
           continue;
         }
         CXFA_Value defValue(NULL);
         if (wsValue.IsEmpty() && (defValue = pAcc->GetDefaultValue())) {
           defValue.GetChildValueContent(wsValue);
           SetValue(wsValue, XFA_VALUEPICTURE_Raw);
           pAcc->SetValue(wsValue, XFA_VALUEPICTURE_Raw);
         } else {
           CXFA_Node* pItems = pChild->GetChild(0, XFA_ELEMENT_Items);
           if (!pItems) {
             continue;
           }
           CFX_WideString itemText;
           if (pItems->CountChildren(XFA_ELEMENT_UNKNOWN) > 1) {
             itemText = pItems->GetChild(1, XFA_ELEMENT_UNKNOWN)->GetContent();
           }
           pAcc->SetValue(itemText, XFA_VALUEPICTURE_Raw);
         }
         pNextChild = pChild->GetNodeItem(XFA_NODEITEM_NextSibling,
-                                         XFA_OBJECTTYPE_ContainerNode);
+                                         XFA_ObjectType::ContainerNode);
       }
     } break;
     case XFA_ELEMENT_ChoiceList:
       ClearAllSelections();
     default:
       if (CXFA_Value defValue = GetDefaultValue()) {
         defValue.GetChildValueContent(wsValue);
       }
       SetValue(wsValue, XFA_VALUEPICTURE_Raw);
       break;
@@ skipping 83 matching lines @@
       CXFA_Submit submit = event.GetSubmit();
       return GetDoc()->GetDocProvider()->SubmitData(GetDoc(), submit);
     }
     default:
       break;
   }
   return XFA_EVENTERROR_NotExist;
 }
 
 int32_t CXFA_WidgetAcc::ProcessCalculate() {
-  if (GetClassID() == XFA_ELEMENT_Draw) {
+  if (GetClassID() == XFA_ELEMENT_Draw)
     return XFA_EVENTERROR_NotExist;
-  }
+
   CXFA_Calculate calc = GetCalculate();
-  if (!calc) {
+  if (!calc)
     return XFA_EVENTERROR_NotExist;
-  }
-  if (GetNode()->HasFlag(XFA_NODEFLAG_UserInteractive)) {
+  if (GetNode()->IsUserInteractive())
     return XFA_EVENTERROR_Disabled;
-  }
+
   CXFA_EventParam EventParam;
   EventParam.m_eType = XFA_EVENT_Calculate;
   CXFA_Script script = calc.GetScript();
   int32_t iRet = ExecuteScript(script, &EventParam);
   if (iRet != XFA_EVENTERROR_Success)
     return iRet;
 
   if (GetRawValue() != EventParam.m_wsResult) {
     SetValue(EventParam.m_wsResult, XFA_VALUEPICTURE_Raw);
     UpdateUIDisplay();
@@ skipping 10 matching lines @@
       IXFA_AppProvider* pAppProvider = GetAppProvider();
       if (!pAppProvider) {
         return;
       }
       CFX_WideString wsTitle;
       pAppProvider->LoadString(XFA_IDS_AppName, wsTitle);
       CFX_WideString wsScriptMsg;
       validate.GetScriptMessageText(wsScriptMsg);
       int32_t eScriptTest = validate.GetScriptTest();
       if (eScriptTest == XFA_ATTRIBUTEENUM_Warning) {
-        if (GetNode()->HasFlag(XFA_NODEFLAG_UserInteractive)) {
+        if (GetNode()->IsUserInteractive())
           return;
-        }
-        if (wsScriptMsg.IsEmpty()) {
+        if (wsScriptMsg.IsEmpty())
           GetValidateMessage(pAppProvider, wsScriptMsg, FALSE, bVersionFlag);
-        }
+
         if (bVersionFlag) {
           pAppProvider->MsgBox(wsScriptMsg, wsTitle, XFA_MBICON_Warning,
                                XFA_MB_OK);
           return;
         }
         if (pAppProvider->MsgBox(wsScriptMsg, wsTitle, XFA_MBICON_Warning,
                                  XFA_MB_YesNo) == XFA_IDYes) {
-          GetNode()->SetFlag(XFA_NODEFLAG_UserInteractive, false);
+          GetNode()->SetFlag(XFA_NodeFlag_UserInteractive, false);
         }
       } else {
         if (wsScriptMsg.IsEmpty()) {
           GetValidateMessage(pAppProvider, wsScriptMsg, TRUE, bVersionFlag);
         }
         pAppProvider->MsgBox(wsScriptMsg, wsTitle, XFA_MBICON_Error, XFA_MB_OK);
       }
     }
   }
 }
@@ skipping 21 matching lines @@
       CFX_WideString wsTitle;
       pAppProvider->LoadString(XFA_IDS_AppName, wsTitle);
       int32_t eFormatTest = validate.GetFormatTest();
       if (eFormatTest == XFA_ATTRIBUTEENUM_Error) {
         if (wsFormatMsg.IsEmpty()) {
           GetValidateMessage(pAppProvider, wsFormatMsg, TRUE, bVersionFlag);
         }
         pAppProvider->MsgBox(wsFormatMsg, wsTitle, XFA_MBICON_Error, XFA_MB_OK);
         return XFA_EVENTERROR_Success;
       }
-      if (GetNode()->HasFlag(XFA_NODEFLAG_UserInteractive)) {
+      if (GetNode()->IsUserInteractive())
         return XFA_EVENTERROR_NotExist;
-      }
-      if (wsFormatMsg.IsEmpty()) {
+      if (wsFormatMsg.IsEmpty())
         GetValidateMessage(pAppProvider, wsFormatMsg, FALSE, bVersionFlag);
-      }
+
       if (bVersionFlag) {
         pAppProvider->MsgBox(wsFormatMsg, wsTitle, XFA_MBICON_Warning,
                              XFA_MB_OK);
         return XFA_EVENTERROR_Success;
       }
       if (pAppProvider->MsgBox(wsFormatMsg, wsTitle, XFA_MBICON_Warning,
                                XFA_MB_YesNo) == XFA_IDYes) {
-        GetNode()->SetFlag(XFA_NODEFLAG_UserInteractive, false);
+        GetNode()->SetFlag(XFA_NodeFlag_UserInteractive, false);
       }
       return XFA_EVENTERROR_Success;
     }
   }
   return XFA_EVENTERROR_NotExist;
 }
 int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_Validate validate,
                                                 int32_t iFlags,
                                                 FX_BOOL bVersionFlag) {
   CFX_WideString wsValue;
@@ skipping 37 matching lines @@
       if (wsNullMsg.IsEmpty()) {
         GetValidateCaptionName(wsCaptionName, bVersionFlag);
         CFX_WideString wsError;
         pAppProvider->LoadString(XFA_IDS_ValidateNullError, wsError);
         wsNullMsg.Format(wsError.c_str(), wsCaptionName.c_str());
       }
       pAppProvider->MsgBox(wsNullMsg, wsTitle, XFA_MBICON_Status, XFA_MB_OK);
       return XFA_EVENTERROR_Error;
     }
     case XFA_ATTRIBUTEENUM_Warning: {
-      if (GetNode()->HasFlag(XFA_NODEFLAG_UserInteractive)) {
+      if (GetNode()->IsUserInteractive())
         return TRUE;
-      }
+
       if (wsNullMsg.IsEmpty()) {
         GetValidateCaptionName(wsCaptionName, bVersionFlag);
         CFX_WideString wsWarning;
         pAppProvider->LoadString(XFA_IDS_ValidateNullWarning, wsWarning);
         wsNullMsg.Format(wsWarning.c_str(), wsCaptionName.c_str(),
                          wsCaptionName.c_str());
       }
       if (pAppProvider->MsgBox(wsNullMsg, wsTitle, XFA_MBICON_Warning,
                                XFA_MB_YesNo) == XFA_IDYes) {
-        GetNode()->SetFlag(XFA_NODEFLAG_UserInteractive, false);
+        GetNode()->SetFlag(XFA_NodeFlag_UserInteractive, false);
       }
       return XFA_EVENTERROR_Error;
     }
     case XFA_ATTRIBUTEENUM_Disabled:
     default:
       break;
   }
   return XFA_EVENTERROR_Success;
 }
 void CXFA_WidgetAcc::GetValidateCaptionName(CFX_WideString& wsCaptionName,
@@ skipping 37 matching lines @@
                    wsCaptionName.c_str());
 }
 int32_t CXFA_WidgetAcc::ProcessValidate(int32_t iFlags) {
   if (GetClassID() == XFA_ELEMENT_Draw) {
     return XFA_EVENTERROR_NotExist;
   }
   CXFA_Validate validate = GetValidate();
   if (!validate) {
     return XFA_EVENTERROR_NotExist;
   }
-  FX_BOOL bInitDoc = validate.GetNode()->HasFlag(XFA_NODEFLAG_NeedsInitApp);
+  FX_BOOL bInitDoc = validate.GetNode()->NeedsInitApp();
   FX_BOOL bStatus =
       m_pDocView->GetLayoutStatus() < XFA_DOCVIEW_LAYOUTSTATUS_End;
   int32_t iFormat = 0;
   CFXJSE_Value* pRetValue = nullptr;
   int32_t iRet = XFA_EVENTERROR_NotExist;
   CXFA_Script script = validate.GetScript();
   if (script) {
     CXFA_EventParam eParam;
     eParam.m_eType = XFA_EVENT_Validate;
     eParam.m_pTarget = this;
     iRet = ExecuteScript(script, &eParam,
                          ((bInitDoc || bStatus) && GetRawValue().IsEmpty())
                              ? nullptr
                              : &pRetValue);
   }
   XFA_VERSION version = GetDoc()->GetXFADoc()->GetCurVersionMode();
   FX_BOOL bVersionFlag = FALSE;
   if (version < XFA_VERSION_208) {
     bVersionFlag = TRUE;
   }
   if (bInitDoc) {
-    validate.GetNode()->ClearFlag(XFA_NODEFLAG_NeedsInitApp);
+    validate.GetNode()->ClearFlag(XFA_NodeFlag_NeedsInitApp);
   } else {
     iFormat = ProcessFormatTestValidate(validate, bVersionFlag);
     if (!bVersionFlag) {
       bVersionFlag = GetDoc()->GetXFADoc()->HasFlag(XFA_DOCFLAG_Scripting);
     }
     iRet |= ProcessNullTestValidate(validate, iFlags, bVersionFlag);
   }
   if (iFormat != XFA_EVENTERROR_Success) {
     ProcessScriptTestValidate(validate, iRet, pRetValue, bVersionFlag);
   }
@@ skipping 1075 matching lines @@
     if (pIDNode) {
       pEmbAcc = static_cast<CXFA_WidgetAcc*>(pIDNode->GetWidgetData());
     }
     if (pEmbAcc) {
       pEmbAcc->GetValue(wsValue, XFA_VALUEPICTURE_Display);
       return TRUE;
     }
   }
   return FALSE;
 }