Split the XFA_OBJECTTYPE enum into two parts.

xfa/fxfa/parser/xfa_document_layout_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 "xfa/fxfa/parser/xfa_document_layout_imp.h"
 
 #include "xfa/fxfa/parser/xfa_basic_imp.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
@@ skipping 97 matching lines @@
          m_nProgressCounter;
 }
 FX_BOOL CXFA_LayoutProcessor::IncrementLayout() {
   if (m_bNeeLayout) {
     StartLayout(TRUE);
     return DoLayout(NULL) == 100;
   }
   for (int32_t i = 0, c = m_rgChangedContainers.GetSize(); i < c; i++) {
     CXFA_Node* pNode = m_rgChangedContainers[i];
     CXFA_Node* pParentNode =
-        pNode->GetNodeItem(XFA_NODEITEM_Parent, XFA_OBJECTTYPE_ContainerNode);
+        pNode->GetNodeItem(XFA_NODEITEM_Parent, XFA_ObjectType::ContainerNode);
     if (!pParentNode) {
       return FALSE;
     }
     if (!CXFA_ItemLayoutProcessor::IncrementRelayoutNode(this, pNode,
                                                          pParentNode)) {
       return FALSE;
     }
   }
   m_rgChangedContainers.RemoveAll();
   return TRUE;
@@ skipping 67 matching lines @@
 CXFA_ContentLayoutItem::CXFA_ContentLayoutItem(CXFA_Node* pNode)
     : CXFA_LayoutItem(pNode, TRUE),
       m_pPrev(NULL),
       m_pNext(NULL),
       m_dwStatus(0) {}
 CXFA_ContentLayoutItem::~CXFA_ContentLayoutItem() {
   if (m_pFormNode->GetUserData(XFA_LAYOUTITEMKEY) == this) {
     m_pFormNode->SetUserData(XFA_LAYOUTITEMKEY, NULL);
   }
 }