XFA_WIDGETSTATUS, LAYOUTSTATUS and WIDGETFILTER cleanup.

xfa/fxfa/parser/xfa_layout_pagemgr_new.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_layout_pagemgr_new.h"
 
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
 #include "xfa/fxfa/parser/xfa_document.h"
 #include "xfa/fxfa/parser/xfa_document_datamerger_imp.h"
 #include "xfa/fxfa/parser/xfa_document_layout_imp.h"
 #include "xfa/fxfa/parser/xfa_layout_appadapter.h"
 #include "xfa/fxfa/parser/xfa_layout_itemlayout.h"
 #include "xfa/fxfa/parser/xfa_localemgr.h"
 #include "xfa/fxfa/parser/xfa_object.h"
 #include "xfa/fxfa/parser/xfa_parser.h"
 #include "xfa/fxfa/parser/xfa_parser_imp.h"
 #include "xfa/fxfa/parser/xfa_script.h"
 #include "xfa/fxfa/parser/xfa_script_imp.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 
+namespace {
+
+class PageSetContainerLayoutItem {
+ public:
+  static inline CXFA_ContainerLayoutItem* GetFirstChild(
+      CXFA_ContainerLayoutItem* pLayoutItem) {
+    if (pLayoutItem->m_pFormNode->GetClassID() != XFA_ELEMENT_PageSet)
+      return nullptr;
+
+    CXFA_ContainerLayoutItem* pChildItem =
+        static_cast<CXFA_ContainerLayoutItem*>(pLayoutItem->m_pFirstChild);
+    while (pChildItem &&
+           pChildItem->m_pFormNode->GetClassID() != XFA_ELEMENT_PageSet) {
+      pChildItem =
+          static_cast<CXFA_ContainerLayoutItem*>(pChildItem->m_pNextSibling);
+    }
+    return pChildItem;
+  }
+
+  static inline CXFA_ContainerLayoutItem* GetNextSibling(
+      CXFA_ContainerLayoutItem* pLayoutItem) {
+    CXFA_ContainerLayoutItem* pChildItem =
+        static_cast<CXFA_ContainerLayoutItem*>(pLayoutItem->m_pNextSibling);
+    while (pChildItem &&
+           pChildItem->m_pFormNode->GetClassID() != XFA_ELEMENT_PageSet) {
+      pChildItem =
+          static_cast<CXFA_ContainerLayoutItem*>(pChildItem->m_pNextSibling);
+    }
+    return pChildItem;
+  }
+
+  static inline CXFA_ContainerLayoutItem* GetParent(
+      CXFA_ContainerLayoutItem* pLayoutItem) {
+    return static_cast<CXFA_ContainerLayoutItem*>(pLayoutItem->m_pParent);
+  }
+};
+
+uint32_t GetRelevant(CXFA_Node* pFormItem, uint32_t dwParentRelvant) {
+  uint32_t dwRelevant = XFA_WidgetStatus_Viewable | XFA_WidgetStatus_Printable;
+  CFX_WideStringC wsRelevant;
+  if (pFormItem->TryCData(XFA_ATTRIBUTE_Relevant, wsRelevant)) {
+    if (wsRelevant == FX_WSTRC(L"+print") || wsRelevant == FX_WSTRC(L"print"))
+      dwRelevant &= ~XFA_WidgetStatus_Viewable;
+    else if (wsRelevant == FX_WSTRC(L"-print"))
+      dwRelevant &= ~XFA_WidgetStatus_Printable;
+  }
+  if (!(dwParentRelvant & XFA_WidgetStatus_Viewable) &&
+      (dwRelevant != XFA_WidgetStatus_Viewable)) {
+    dwRelevant &= ~XFA_WidgetStatus_Viewable;
+  }
+  if (!(dwParentRelvant & XFA_WidgetStatus_Printable) &&
+      (dwRelevant != XFA_WidgetStatus_Printable)) {
+    dwRelevant &= ~XFA_WidgetStatus_Printable;
+  }
+  return dwRelevant;
+}
+
+void SyncContainer(CXFA_FFNotify* pNotify,
+                   CXFA_LayoutProcessor* pDocLayout,
+                   CXFA_LayoutItem* pContainerItem,
+                   uint32_t dwRelevant,
+                   FX_BOOL bVisible,
+                   int32_t nPageIndex) {
+  FX_BOOL bVisibleItem = FALSE;
+  uint32_t dwStatus = 0;
+  uint32_t dwRelevantContainer = 0;
+  if (bVisible) {
+    XFA_ATTRIBUTEENUM eAttributeValue =
+        pContainerItem->m_pFormNode->GetEnum(XFA_ATTRIBUTE_Presence);
+    if (eAttributeValue == XFA_ATTRIBUTEENUM_Visible ||
+        eAttributeValue == XFA_ATTRIBUTEENUM_Unknown) {
+      bVisibleItem = TRUE;
+    }
+    dwRelevantContainer = GetRelevant(pContainerItem->m_pFormNode, dwRelevant);
+    dwStatus =
+        (bVisibleItem ? XFA_WidgetStatus_Visible : 0) | dwRelevantContainer;
+  }
+  pNotify->OnLayoutItemAdded(pDocLayout, pContainerItem, nPageIndex, dwStatus);
+  for (CXFA_LayoutItem* pChild = pContainerItem->m_pFirstChild; pChild;
+       pChild = pChild->m_pNextSibling) {
+    if (pChild->IsContentLayoutItem()) {
+      SyncContainer(pNotify, pDocLayout, pChild, dwRelevantContainer,
+                    bVisibleItem, nPageIndex);
+    }
+  }
+}
+
+void ReorderLayoutItemToTail(CXFA_ContainerLayoutItem* pLayoutItem) {
+  CXFA_ContainerLayoutItem* pParentLayoutItem =
+      (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent;
+  if (!pParentLayoutItem)
+    return;
+
+  pParentLayoutItem->RemoveChild(pLayoutItem);
+  pParentLayoutItem->AddChild(pLayoutItem);
+}
+
+void RemoveLayoutItem(CXFA_ContainerLayoutItem* pLayoutItem) {
+  CXFA_ContainerLayoutItem* pParentLayoutItem =
+      (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent;
+  if (!pParentLayoutItem)
+    return;
+
+  pParentLayoutItem->RemoveChild(pLayoutItem);
+}
+
+CXFA_Node* ResolveBreakTarget(CXFA_Node* pPageSetRoot,
+                              FX_BOOL bNewExprStyle,
+                              CFX_WideStringC& wsTargetExpr) {
+  CXFA_Document* pDocument = pPageSetRoot->GetDocument();
+  if (wsTargetExpr.IsEmpty())
+    return nullptr;
+
+  CFX_WideString wsTargetAll(wsTargetExpr);
+  wsTargetAll.TrimLeft();
+  wsTargetAll.TrimRight();
+  int32_t iSpliteIndex = 0;
+  FX_BOOL bTargetAllFind = TRUE;
+  while (iSpliteIndex != -1) {
+    CFX_WideString wsTargetExpr;
+    int32_t iSpliteNextIndex = 0;
+    if (!bTargetAllFind) {
+      iSpliteNextIndex = wsTargetAll.Find(' ', iSpliteIndex);
+      wsTargetExpr =
+          wsTargetAll.Mid(iSpliteIndex, iSpliteNextIndex - iSpliteIndex);
+    } else {
+      wsTargetExpr = wsTargetAll;
+    }
+    if (wsTargetExpr.IsEmpty())
+      return nullptr;
+
+    bTargetAllFind = FALSE;
+    if (wsTargetExpr.GetAt(0) == '#') {
+      CXFA_Node* pNode = pDocument->GetNodeByID(
+          ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Template)),
+          wsTargetExpr.Mid(1).AsStringC());
+      if (pNode)
+        return pNode;
+    } else if (bNewExprStyle) {
+      CFX_WideString wsProcessedTarget = wsTargetExpr;
+      if (wsTargetExpr.Left(4) == FX_WSTRC(L"som(") &&
+          wsTargetExpr.Right(1) == FX_WSTRC(L")")) {
+        wsProcessedTarget = wsTargetExpr.Mid(4, wsTargetExpr.GetLength() - 5);
+      }
+      XFA_RESOLVENODE_RS rs;
+      int32_t iCount = pDocument->GetScriptContext()->ResolveObjects(
+          pPageSetRoot, wsProcessedTarget.AsStringC(), rs,
+          XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
+              XFA_RESOLVENODE_Attributes | XFA_RESOLVENODE_Siblings |
+              XFA_RESOLVENODE_Parent);
+      if (iCount > 0 && rs.nodes[0]->IsNode())
+        return rs.nodes[0]->AsNode();
+    }
+    iSpliteIndex = iSpliteNextIndex;
+  }
+  return nullptr;
+}
+
+void SetLayoutGeneratedNodeFlag(CXFA_Node* pNode) {
+  pNode->SetFlag(XFA_NODEFLAG_LayoutGeneratedNode, false);
+  pNode->ClearFlag(XFA_NODEFLAG_UnusedNode);
+}
+
+FX_BOOL CheckContentAreaNotUsed(
+    CXFA_ContainerLayoutItem* pPageAreaLayoutItem,
+    CXFA_Node* pContentArea,
+    CXFA_ContainerLayoutItem*& pContentAreaLayoutItem) {
+  for (CXFA_ContainerLayoutItem* pLayoutItem =
+           (CXFA_ContainerLayoutItem*)pPageAreaLayoutItem->m_pFirstChild;
+       pLayoutItem;
+       pLayoutItem = (CXFA_ContainerLayoutItem*)pLayoutItem->m_pNextSibling) {
+    if (pLayoutItem->m_pFormNode == pContentArea) {
+      if (pLayoutItem->m_pFirstChild == NULL) {
+        pContentAreaLayoutItem = pLayoutItem;
+        return TRUE;
+      }
+      return FALSE;
+    }
+  }
+  return TRUE;
+}
+
+void SyncRemoveLayoutItem(CXFA_LayoutItem* pParentLayoutItem,
+                          CXFA_FFNotify* pNotify,
+                          CXFA_LayoutProcessor* pDocLayout) {
+  CXFA_LayoutItem* pNextLayoutItem;
+  CXFA_LayoutItem* pCurLayoutItem = pParentLayoutItem->m_pFirstChild;
+  while (pCurLayoutItem) {
+    pNextLayoutItem = pCurLayoutItem->m_pNextSibling;
+    if (pCurLayoutItem->m_pFirstChild)
+      SyncRemoveLayoutItem(pCurLayoutItem, pNotify, pDocLayout);
+
+    pNotify->OnLayoutItemRemoving(pDocLayout, pCurLayoutItem);
+    delete pCurLayoutItem;
+    pCurLayoutItem = pNextLayoutItem;
+  }
+}
+
+}  // namespace
+
 CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor)
     : m_pLayoutProcessor(pLayoutProcessor),
       m_pTemplatePageSetRoot(nullptr),
       m_pPageSetLayoutItemRoot(nullptr),
       m_pPageSetCurRoot(nullptr),
       m_pCurrentContainerRecord(nullptr),
       m_pCurPageArea(nullptr),
       m_nAvailPages(0),
       m_nCurPageCount(0),
       m_ePageSetMode(XFA_ATTRIBUTEENUM_OrderedOccurrence),
@@ skipping 137 matching lines @@
   }
   CXFA_Node* pPageNode = GetNextAvailPageArea(NULL);
   if (!pPageNode) {
     return FALSE;
   }
   if (bFirstTemPage && m_pCurrentContainerRecord == NULL) {
     m_pCurrentContainerRecord = m_rgProposedContainerRecord.GetHeadPosition();
   }
   return !bFirstTemPage || m_pCurrentContainerRecord;
 }
-static void XFA_LayoutItemMgr_ReorderLayoutItemToTail(
-    CXFA_ContainerLayoutItem* pLayoutItem) {
-  CXFA_ContainerLayoutItem* pParentLayoutItem =
-      (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent;
-  if (!pParentLayoutItem) {
-    return;
-  }
-  pParentLayoutItem->RemoveChild(pLayoutItem);
-  pParentLayoutItem->AddChild(pLayoutItem);
-}
-static void XFA_LayoutItemMgr_RemoveLayoutItem(
-    CXFA_ContainerLayoutItem* pLayoutItem) {
-  CXFA_ContainerLayoutItem* pParentLayoutItem =
-      (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent;
-  if (!pParentLayoutItem) {
-    return;
-  }
-  pParentLayoutItem->RemoveChild(pLayoutItem);
-}
+
 void CXFA_LayoutPageMgr::RemoveLayoutRecord(CXFA_ContainerRecord* pNewRecord,
                                             CXFA_ContainerRecord* pPrevRecord) {
   if (!pNewRecord || !pPrevRecord) {
     return;
   }
   if (pNewRecord->pCurPageSet != pPrevRecord->pCurPageSet) {
-    XFA_LayoutItemMgr_RemoveLayoutItem(pNewRecord->pCurPageSet);
+    RemoveLayoutItem(pNewRecord->pCurPageSet);
     return;
   }
   if (pNewRecord->pCurPageArea != pPrevRecord->pCurPageArea) {
-    XFA_LayoutItemMgr_RemoveLayoutItem(pNewRecord->pCurPageArea);
+    RemoveLayoutItem(pNewRecord->pCurPageArea);
     return;
   }
   if (pNewRecord->pCurContentArea != pPrevRecord->pCurContentArea) {
-    XFA_LayoutItemMgr_RemoveLayoutItem(pNewRecord->pCurContentArea);
+    RemoveLayoutItem(pNewRecord->pCurContentArea);
     return;
   }
 }
 void CXFA_LayoutPageMgr::ReorderPendingLayoutRecordToTail(
     CXFA_ContainerRecord* pNewRecord,
     CXFA_ContainerRecord* pPrevRecord) {
   if (!pNewRecord || !pPrevRecord) {
     return;
   }
   if (pNewRecord->pCurPageSet != pPrevRecord->pCurPageSet) {
-    XFA_LayoutItemMgr_ReorderLayoutItemToTail(pNewRecord->pCurPageSet);
+    ReorderLayoutItemToTail(pNewRecord->pCurPageSet);
     return;
   }
   if (pNewRecord->pCurPageArea != pPrevRecord->pCurPageArea) {
-    XFA_LayoutItemMgr_ReorderLayoutItemToTail(pNewRecord->pCurPageArea);
+    ReorderLayoutItemToTail(pNewRecord->pCurPageArea);
     return;
   }
   if (pNewRecord->pCurContentArea != pPrevRecord->pCurContentArea) {
-    XFA_LayoutItemMgr_ReorderLayoutItemToTail(pNewRecord->pCurContentArea);
+    ReorderLayoutItemToTail(pNewRecord->pCurContentArea);
     return;
   }
 }
 void CXFA_LayoutPageMgr::SubmitContentItem(
     CXFA_ContentLayoutItem* pContentLayoutItem,
     XFA_ItemLayoutProcessorResult eStatus) {
   if (pContentLayoutItem) {
     GetCurrentContainerRecord()->pCurContentArea->AddChild(pContentLayoutItem);
     m_bCreateOverFlowPage = FALSE;
   }
@@ skipping 15 matching lines @@
   FX_FLOAT fAvailHeight =
       pLayoutItem->m_pFormNode->GetMeasure(XFA_ATTRIBUTE_H).ToUnit(XFA_UNIT_Pt);
   if (fAvailHeight >= XFA_LAYOUT_FLOAT_PERCISION)
     return fAvailHeight;
   if (m_pCurrentContainerRecord ==
       m_rgProposedContainerRecord.GetHeadPosition()) {
     return 0.0f;
   }
   return XFA_LAYOUT_FLOAT_MAX;
 }
-static CXFA_Node* XFA_ResolveBreakTarget(CXFA_Node* pPageSetRoot,
-                                         FX_BOOL bNewExprStyle,
-                                         CFX_WideStringC& wsTargetExpr) {
-  CXFA_Document* pDocument = pPageSetRoot->GetDocument();
-  if (wsTargetExpr.IsEmpty()) {
-    return NULL;
-  }
-  CFX_WideString wsTargetAll(wsTargetExpr);
-  wsTargetAll.TrimLeft();
-  wsTargetAll.TrimRight();
-  int32_t iSpliteIndex = 0;
-  FX_BOOL bTargetAllFind = TRUE;
-  while (iSpliteIndex != -1) {
-    CFX_WideString wsTargetExpr;
-    int32_t iSpliteNextIndex = 0;
-    if (!bTargetAllFind) {
-      iSpliteNextIndex = wsTargetAll.Find(' ', iSpliteIndex);
-      wsTargetExpr =
-          wsTargetAll.Mid(iSpliteIndex, iSpliteNextIndex - iSpliteIndex);
-    } else {
-      wsTargetExpr = wsTargetAll;
-    }
-    if (wsTargetExpr.IsEmpty()) {
-      return NULL;
-    }
-    bTargetAllFind = FALSE;
-    if (wsTargetExpr.GetAt(0) == '#') {
-      CXFA_Node* pNode = pDocument->GetNodeByID(
-          ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Template)),
-          wsTargetExpr.Mid(1).AsStringC());
-      if (pNode) {
-        return pNode;
-      }
-    } else if (bNewExprStyle) {
-      CFX_WideString wsProcessedTarget = wsTargetExpr;
-      if (wsTargetExpr.Left(4) == FX_WSTRC(L"som(") &&
-          wsTargetExpr.Right(1) == FX_WSTRC(L")")) {
-        wsProcessedTarget = wsTargetExpr.Mid(4, wsTargetExpr.GetLength() - 5);
-      }
-      XFA_RESOLVENODE_RS rs;
-      int32_t iCount = pDocument->GetScriptContext()->ResolveObjects(
-          pPageSetRoot, wsProcessedTarget.AsStringC(), rs,
-          XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
-              XFA_RESOLVENODE_Attributes | XFA_RESOLVENODE_Siblings |
-              XFA_RESOLVENODE_Parent);
-      if (iCount > 0 && rs.nodes[0]->IsNode()) {
-        return rs.nodes[0]->AsNode();
-      }
-    }
-    iSpliteIndex = iSpliteNextIndex;
-  }
-  return NULL;
-}
 
 FX_BOOL XFA_LayoutPageMgr_RunBreakTestScript(CXFA_Node* pTestScript) {
   CFX_WideString wsExpression;
   pTestScript->TryContent(wsExpression);
   if (wsExpression.IsEmpty()) {
     return TRUE;
   }
   return pTestScript->GetDocument()->GetParser()->GetNotify()->RunScript(
       pTestScript, pTestScript->GetNodeItem(XFA_NODEITEM_Parent,
                                             XFA_OBJECTTYPE_ContainerNode));
@@ skipping 94 matching lines @@
   if (pContentArea == NULL) {
     pNewRecord->pCurContentArea = NULL;
     return;
   }
   CXFA_ContainerLayoutItem* pNewContentAreaLayoutItem =
       new CXFA_ContainerLayoutItem(pContentArea);
   ASSERT(pNewRecord->pCurPageArea);
   pNewRecord->pCurPageArea->AddChild(pNewContentAreaLayoutItem);
   pNewRecord->pCurContentArea = pNewContentAreaLayoutItem;
 }
-class CXFA_TraverseStrategy_PageSetContainerLayoutItem {
- public:
-  static inline CXFA_ContainerLayoutItem* GetFirstChild(
-      CXFA_ContainerLayoutItem* pLayoutItem) {
-    if (pLayoutItem->m_pFormNode->GetClassID() == XFA_ELEMENT_PageSet) {
-      CXFA_ContainerLayoutItem* pChildItem =
-          (CXFA_ContainerLayoutItem*)pLayoutItem->m_pFirstChild;
-      while (pChildItem &&
-             pChildItem->m_pFormNode->GetClassID() != XFA_ELEMENT_PageSet) {
-        pChildItem = (CXFA_ContainerLayoutItem*)pChildItem->m_pNextSibling;
-      }
-      return pChildItem;
-    }
-    return NULL;
-  }
-  static inline CXFA_ContainerLayoutItem* GetNextSibling(
-      CXFA_ContainerLayoutItem* pLayoutItem) {
-    CXFA_ContainerLayoutItem* pChildItem =
-        (CXFA_ContainerLayoutItem*)pLayoutItem->m_pNextSibling;
-    while (pChildItem &&
-           pChildItem->m_pFormNode->GetClassID() != XFA_ELEMENT_PageSet) {
-      pChildItem = (CXFA_ContainerLayoutItem*)pChildItem->m_pNextSibling;
-    }
-    return pChildItem;
-  }
-  static inline CXFA_ContainerLayoutItem* GetParent(
-      CXFA_ContainerLayoutItem* pLayoutItem) {
-    return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent;
-  }
-};
+
 void CXFA_LayoutPageMgr::FinishPaginatedPageSets() {
   CXFA_ContainerLayoutItem* pRootPageSetLayoutItem = m_pPageSetLayoutItemRoot;
   for (; pRootPageSetLayoutItem;
        pRootPageSetLayoutItem =
            (CXFA_ContainerLayoutItem*)pRootPageSetLayoutItem->m_pNextSibling) {
     CXFA_NodeIteratorTemplate<CXFA_ContainerLayoutItem,
-                              CXFA_TraverseStrategy_PageSetContainerLayoutItem>
+                              PageSetContainerLayoutItem>
         sIterator(pRootPageSetLayoutItem);
     for (CXFA_ContainerLayoutItem* pPageSetLayoutItem = sIterator.GetCurrent();
          pPageSetLayoutItem; pPageSetLayoutItem = sIterator.MoveToNext()) {
       XFA_ATTRIBUTEENUM ePageRelation =
           pPageSetLayoutItem->m_pFormNode->GetEnum(XFA_ATTRIBUTE_Relation);
       switch (ePageRelation) {
         case XFA_ATTRIBUTEENUM_OrderedOccurrence:
         default: { ProcessLastPageSet(); } break;
         case XFA_ATTRIBUTEENUM_SimplexPaginated:
         case XFA_ATTRIBUTEENUM_DuplexPaginated: {
@@ skipping 156 matching lines @@
           pTarget != GetCurrentContainerRecord()->pCurPageArea->m_pFormNode ||
           bStartNew) {
         CXFA_Node* pPageArea = GetNextAvailPageArea(pTarget, NULL, TRUE);
         bRet = pPageArea != NULL;
       }
       break;
     case XFA_ATTRIBUTEENUM_PageOdd:
       if (pTarget && pTarget->GetClassID() != XFA_ELEMENT_PageArea) {
         pTarget = NULL;
       }
-      if (m_nAvailPages % 2 != 1 || !m_pCurrentContainerRecord ||
-          (pTarget &&
-           pTarget != GetCurrentContainerRecord()->pCurPageArea->m_pFormNode) ||
-          bStartNew) {
-        if (m_nAvailPages % 2 == 1) {
-        }
-      }
       break;
     case XFA_ATTRIBUTEENUM_PageEven:
       if (pTarget && pTarget->GetClassID() != XFA_ELEMENT_PageArea) {
         pTarget = NULL;
       }
-      if (m_nAvailPages % 2 != 0 || !m_pCurrentContainerRecord ||
-          (pTarget &&
-           pTarget != GetCurrentContainerRecord()->pCurPageArea->m_pFormNode) ||
-          bStartNew) {
-        if (m_nAvailPages % 2 == 0) {
-        }
-      }
       break;
     case XFA_ATTRIBUTEENUM_Auto:
     default:
       break;
   }
   return bRet;
 }
 FX_BOOL CXFA_LayoutPageMgr::ExecuteBreakBeforeOrAfter(
     CXFA_Node* pCurNode,
     FX_BOOL bBefore,
     CXFA_Node*& pBreakLeaderTemplate,
     CXFA_Node*& pBreakTrailerTemplate) {
   XFA_ELEMENT eType = pCurNode->GetClassID();
   switch (eType) {
     case XFA_ELEMENT_BreakBefore:
     case XFA_ELEMENT_BreakAfter: {
       CFX_WideStringC wsBreakLeader, wsBreakTrailer;
       CXFA_Node* pFormNode = pCurNode->GetNodeItem(
           XFA_NODEITEM_Parent, XFA_OBJECTTYPE_ContainerNode);
       CXFA_Node* pContainer = pFormNode->GetTemplateNode();
       FX_BOOL bStartNew = pCurNode->GetInteger(XFA_ATTRIBUTE_StartNew) != 0;
       CXFA_Node* pScript = pCurNode->GetFirstChildByClass(XFA_ELEMENT_Script);
       if (pScript && !XFA_LayoutPageMgr_RunBreakTestScript(pScript)) {
         return FALSE;
       }
       CFX_WideStringC wsTarget = pCurNode->GetCData(XFA_ATTRIBUTE_Target);
       CXFA_Node* pTarget =
-          XFA_ResolveBreakTarget(m_pTemplatePageSetRoot, TRUE, wsTarget);
+          ResolveBreakTarget(m_pTemplatePageSetRoot, TRUE, wsTarget);
       wsBreakTrailer = pCurNode->GetCData(XFA_ATTRIBUTE_Trailer);
       wsBreakLeader = pCurNode->GetCData(XFA_ATTRIBUTE_Leader);
       pBreakLeaderTemplate =
-          XFA_ResolveBreakTarget(pContainer, TRUE, wsBreakLeader);
+          ResolveBreakTarget(pContainer, TRUE, wsBreakLeader);
       pBreakTrailerTemplate =
-          XFA_ResolveBreakTarget(pContainer, TRUE, wsBreakTrailer);
+          ResolveBreakTarget(pContainer, TRUE, wsBreakTrailer);
       if (RunBreak(eType, pCurNode->GetEnum(XFA_ATTRIBUTE_TargetType), pTarget,
                    bStartNew)) {
         return TRUE;
       } else {
         if (m_rgProposedContainerRecord.GetCount() > 0 &&
             m_pCurrentContainerRecord ==
                 m_rgProposedContainerRecord.GetHeadPosition() &&
             eType == XFA_ELEMENT_BreakBefore) {
           CXFA_Node* pParentNode = pFormNode->GetNodeItem(
               XFA_NODEITEM_Parent, XFA_OBJECTTYPE_ContainerNode);
           if (!pParentNode ||
               pFormNode !=
                   pParentNode->GetNodeItem(XFA_NODEITEM_FirstChild,
                                            XFA_OBJECTTYPE_ContainerNode)) {
             break;
           }
           pParentNode = pParentNode->GetNodeItem(XFA_NODEITEM_Parent);
           if (!pParentNode || pParentNode->GetClassID() != XFA_ELEMENT_Form) {
             break;
           }
           return TRUE;
         }
       }
     } break;
     case XFA_ELEMENT_Break: {
       FX_BOOL bStartNew = pCurNode->GetInteger(XFA_ATTRIBUTE_StartNew) != 0;
       CFX_WideStringC wsTarget = pCurNode->GetCData(
           bBefore ? XFA_ATTRIBUTE_BeforeTarget : XFA_ATTRIBUTE_AfterTarget);
       CXFA_Node* pTarget =
-          XFA_ResolveBreakTarget(m_pTemplatePageSetRoot, TRUE, wsTarget);
+          ResolveBreakTarget(m_pTemplatePageSetRoot, TRUE, wsTarget);
       if (RunBreak(bBefore ? XFA_ELEMENT_BreakBefore : XFA_ELEMENT_BreakAfter,
                    pCurNode->GetEnum(bBefore ? XFA_ATTRIBUTE_Before
                                              : XFA_ATTRIBUTE_After),
                    pTarget, bStartNew)) {
         return TRUE;
       }
     } break;
     default:
       break;
   }
   return FALSE;
 }
-static void XFA_SetLayoutGeneratedNodeFlag(CXFA_Node* pNode) {
-  pNode->SetFlag(XFA_NODEFLAG_LayoutGeneratedNode, false);
-  pNode->ClearFlag(XFA_NODEFLAG_UnusedNode);
-}
+
 FX_BOOL CXFA_LayoutPageMgr::ProcessBreakBeforeOrAfter(
     CXFA_Node* pBreakNode,
     FX_BOOL bBefore,
     CXFA_Node*& pBreakLeaderNode,
     CXFA_Node*& pBreakTrailerNode,
     FX_BOOL& bCreatePage) {
   CXFA_Node *pLeaderTemplate = NULL, *pTrailerTemplate = NULL;
   CXFA_Node* pFormNode = pBreakNode->GetNodeItem(XFA_NODEITEM_Parent,
                                                  XFA_OBJECTTYPE_ContainerNode);
   if (XFA_ItemLayoutProcessor_IsTakingSpace(pFormNode)) {
     bCreatePage = ExecuteBreakBeforeOrAfter(pBreakNode, bBefore,
                                             pLeaderTemplate, pTrailerTemplate);
     CXFA_Document* pDocument = pBreakNode->GetDocument();
     CXFA_Node* pDataScope = NULL;
     pFormNode = pFormNode->GetNodeItem(XFA_NODEITEM_Parent,
                                        XFA_OBJECTTYPE_ContainerNode);
     if (pLeaderTemplate) {
       if (!pDataScope) {
         pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
       }
       pBreakLeaderNode = pDocument->DataMerge_CopyContainer(
           pLeaderTemplate, pFormNode, pDataScope, TRUE);
       pDocument->DataMerge_UpdateBindingRelations(pBreakLeaderNode);
-      XFA_SetLayoutGeneratedNodeFlag(pBreakLeaderNode);
+      SetLayoutGeneratedNodeFlag(pBreakLeaderNode);
     }
     if (pTrailerTemplate) {
       if (!pDataScope) {
         pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
       }
       pBreakTrailerNode = pDocument->DataMerge_CopyContainer(
           pTrailerTemplate, pFormNode, pDataScope, TRUE);
       pDocument->DataMerge_UpdateBindingRelations(pBreakTrailerNode);
-      XFA_SetLayoutGeneratedNodeFlag(pBreakTrailerNode);
+      SetLayoutGeneratedNodeFlag(pBreakTrailerNode);
     }
     return TRUE;
   }
   return FALSE;
 }
 FX_BOOL CXFA_LayoutPageMgr::ProcessBookendLeaderOrTrailer(
     CXFA_Node* pBookendNode,
     FX_BOOL bLeader,
     CXFA_Node*& pBookendAppendNode) {
   CXFA_Node* pLeaderTemplate = NULL;
   CXFA_Node* pFormNode = pBookendNode->GetNodeItem(
       XFA_NODEITEM_Parent, XFA_OBJECTTYPE_ContainerNode);
   if (ResolveBookendLeaderOrTrailer(pBookendNode, bLeader, pLeaderTemplate)) {
     CXFA_Document* pDocument = pBookendNode->GetDocument();
     CXFA_Node* pDataScope = NULL;
     if (pLeaderTemplate) {
       if (!pDataScope) {
         pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
       }
       pBookendAppendNode = pDocument->DataMerge_CopyContainer(
           pLeaderTemplate, pFormNode, pDataScope, TRUE);
       pDocument->DataMerge_UpdateBindingRelations(pBookendAppendNode);
-      XFA_SetLayoutGeneratedNodeFlag(pBookendAppendNode);
+      SetLayoutGeneratedNodeFlag(pBookendAppendNode);
       return TRUE;
     }
   }
   return FALSE;
 }
 CXFA_Node* CXFA_LayoutPageMgr::BreakOverflow(CXFA_Node* pOverflowNode,
                                              CXFA_Node*& pLeaderTemplate,
                                              CXFA_Node*& pTrailerTemplate,
                                              FX_BOOL bCreatePage) {
   CFX_WideStringC wsOverflowLeader, wsOverflowTrailer;
   CXFA_Node* pContainer =
       pOverflowNode->GetNodeItem(XFA_NODEITEM_Parent,
                                  XFA_OBJECTTYPE_ContainerNode)
           ->GetTemplateNode();
   if (pOverflowNode->GetClassID() == XFA_ELEMENT_Break) {
     CFX_WideStringC wsOverflowLeader;
     CFX_WideStringC wsOverflowTarget;
     CFX_WideStringC wsOverflowTrailer;
     pOverflowNode->TryCData(XFA_ATTRIBUTE_OverflowLeader, wsOverflowLeader);
     pOverflowNode->TryCData(XFA_ATTRIBUTE_OverflowTrailer, wsOverflowTrailer);
     pOverflowNode->TryCData(XFA_ATTRIBUTE_OverflowTarget, wsOverflowTarget);
     if (!wsOverflowLeader.IsEmpty() || !wsOverflowTrailer.IsEmpty() ||
         !wsOverflowTarget.IsEmpty()) {
       if (!wsOverflowTarget.IsEmpty() && bCreatePage &&
           !m_bCreateOverFlowPage) {
-        CXFA_Node* pTarget = XFA_ResolveBreakTarget(m_pTemplatePageSetRoot,
-                                                    TRUE, wsOverflowTarget);
+        CXFA_Node* pTarget =
+            ResolveBreakTarget(m_pTemplatePageSetRoot, TRUE, wsOverflowTarget);
         if (pTarget) {
           m_bCreateOverFlowPage = TRUE;
           switch (pTarget->GetClassID()) {
             case XFA_ELEMENT_PageArea:
               RunBreak(XFA_ELEMENT_Overflow, XFA_ATTRIBUTEENUM_PageArea,
                        pTarget, TRUE);
               break;
             case XFA_ELEMENT_ContentArea:
               RunBreak(XFA_ELEMENT_Overflow, XFA_ATTRIBUTEENUM_ContentArea,
                        pTarget, TRUE);
               break;
             default:
               break;
           }
         }
       }
       if (!bCreatePage) {
         pLeaderTemplate =
-            XFA_ResolveBreakTarget(pContainer, TRUE, wsOverflowLeader);
+            ResolveBreakTarget(pContainer, TRUE, wsOverflowLeader);
         pTrailerTemplate =
-            XFA_ResolveBreakTarget(pContainer, TRUE, wsOverflowTrailer);
+            ResolveBreakTarget(pContainer, TRUE, wsOverflowTrailer);
       }
       return pOverflowNode;
     }
     return NULL;
   } else if (pOverflowNode->GetClassID() == XFA_ELEMENT_Overflow) {
     CFX_WideStringC wsOverflowTarget;
     pOverflowNode->TryCData(XFA_ATTRIBUTE_Leader, wsOverflowLeader);
     pOverflowNode->TryCData(XFA_ATTRIBUTE_Trailer, wsOverflowTrailer);
     pOverflowNode->TryCData(XFA_ATTRIBUTE_Target, wsOverflowTarget);
     if (!wsOverflowTarget.IsEmpty() && bCreatePage && !m_bCreateOverFlowPage) {
-      CXFA_Node* pTarget = XFA_ResolveBreakTarget(m_pTemplatePageSetRoot, TRUE,
-                                                  wsOverflowTarget);
+      CXFA_Node* pTarget =
+          ResolveBreakTarget(m_pTemplatePageSetRoot, TRUE, wsOverflowTarget);
       if (pTarget) {
         m_bCreateOverFlowPage = TRUE;
         switch (pTarget->GetClassID()) {
           case XFA_ELEMENT_PageArea:
             RunBreak(XFA_ELEMENT_Overflow, XFA_ATTRIBUTEENUM_PageArea, pTarget,
                      TRUE);
             break;
           case XFA_ELEMENT_ContentArea:
             RunBreak(XFA_ELEMENT_Overflow, XFA_ATTRIBUTEENUM_ContentArea,
                      pTarget, TRUE);
             break;
           default:
             break;
         }
       }
     }
     if (!bCreatePage) {
-      pLeaderTemplate =
-          XFA_ResolveBreakTarget(pContainer, TRUE, wsOverflowLeader);
+      pLeaderTemplate = ResolveBreakTarget(pContainer, TRUE, wsOverflowLeader);
       pTrailerTemplate =
-          XFA_ResolveBreakTarget(pContainer, TRUE, wsOverflowTrailer);
+          ResolveBreakTarget(pContainer, TRUE, wsOverflowTrailer);
     }
     return pOverflowNode;
   }
   return NULL;
 }
 FX_BOOL CXFA_LayoutPageMgr::ProcessOverflow(CXFA_Node* pFormNode,
                                             CXFA_Node*& pLeaderNode,
                                             CXFA_Node*& pTrailerNode,
                                             FX_BOOL bDataMerge,
                                             FX_BOOL bCreatePage) {
@@ skipping 17 matching lines @@
       }
       CXFA_Document* pDocument = pCurNode->GetDocument();
       CXFA_Node* pDataScope = NULL;
       if (pLeaderTemplate) {
         if (!pDataScope) {
           pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
         }
         pLeaderNode = pDocument->DataMerge_CopyContainer(
             pLeaderTemplate, pFormNode, pDataScope, TRUE);
         pDocument->DataMerge_UpdateBindingRelations(pLeaderNode);
-        XFA_SetLayoutGeneratedNodeFlag(pLeaderNode);
+        SetLayoutGeneratedNodeFlag(pLeaderNode);
       }
       if (pTrailerTemplate) {
         if (!pDataScope) {
           pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
         }
         pTrailerNode = pDocument->DataMerge_CopyContainer(
             pTrailerTemplate, pFormNode, pDataScope, TRUE);
         pDocument->DataMerge_UpdateBindingRelations(pTrailerNode);
-        XFA_SetLayoutGeneratedNodeFlag(pTrailerNode);
+        SetLayoutGeneratedNodeFlag(pTrailerNode);
       }
       return TRUE;
     }
     if (bIsOverflowNode) {
       break;
     }
   }
   return FALSE;
 }
 FX_BOOL CXFA_LayoutPageMgr::ResolveBookendLeaderOrTrailer(
     CXFA_Node* pBookendNode,
     FX_BOOL bLeader,
     CXFA_Node*& pBookendAppendTemplate) {
   CFX_WideStringC wsBookendLeader;
   CXFA_Node* pContainer =
       pBookendNode->GetNodeItem(XFA_NODEITEM_Parent,
                                 XFA_OBJECTTYPE_ContainerNode)
           ->GetTemplateNode();
   if (pBookendNode->GetClassID() == XFA_ELEMENT_Break) {
     pBookendNode->TryCData(
         bLeader ? XFA_ATTRIBUTE_BookendLeader : XFA_ATTRIBUTE_BookendTrailer,
         wsBookendLeader);
     if (!wsBookendLeader.IsEmpty()) {
       pBookendAppendTemplate =
-          XFA_ResolveBreakTarget(pContainer, FALSE, wsBookendLeader);
+          ResolveBreakTarget(pContainer, FALSE, wsBookendLeader);
       return TRUE;
     }
     return FALSE;
   } else if (pBookendNode->GetClassID() == XFA_ELEMENT_Bookend) {
     pBookendNode->TryCData(
         bLeader ? XFA_ATTRIBUTE_Leader : XFA_ATTRIBUTE_Trailer,
         wsBookendLeader);
     pBookendAppendTemplate =
-        XFA_ResolveBreakTarget(pContainer, TRUE, wsBookendLeader);
+        ResolveBreakTarget(pContainer, TRUE, wsBookendLeader);
     return TRUE;
   }
   return FALSE;
 }
 FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet(
     CXFA_Node* pPageSet,
     CXFA_Node* pStartChild,
     CXFA_Node* pTargetPageArea,
     CXFA_Node* pTargetContentArea,
     FX_BOOL bNewPage,
@@ skipping 267 matching lines @@
                                 pTargetContentArea, bNewPage, bQuery)) {
       return m_pCurPageArea;
     }
     if (pPageSet == m_pTemplatePageSetRoot) {
       break;
     }
     pPageSet = pPageSet->GetNodeItem(XFA_NODEITEM_Parent);
   }
   return NULL;
 }
-static FX_BOOL XFA_LayoutPageMgr_CheckContentAreaNotUsed(
-    CXFA_ContainerLayoutItem* pPageAreaLayoutItem,
-    CXFA_Node* pContentArea,
-    CXFA_ContainerLayoutItem*& pContentAreaLayoutItem) {
-  for (CXFA_ContainerLayoutItem* pLayoutItem =
-           (CXFA_ContainerLayoutItem*)pPageAreaLayoutItem->m_pFirstChild;
-       pLayoutItem;
-       pLayoutItem = (CXFA_ContainerLayoutItem*)pLayoutItem->m_pNextSibling) {
-    if (pLayoutItem->m_pFormNode == pContentArea) {
-      if (pLayoutItem->m_pFirstChild == NULL) {
-        pContentAreaLayoutItem = pLayoutItem;
-        return TRUE;
-      }
-      return FALSE;
-    }
-  }
-  return TRUE;
-}
+
 FX_BOOL CXFA_LayoutPageMgr::GetNextContentArea(CXFA_Node* pContentArea) {
   CXFA_Node* pCurContentNode =
       GetCurrentContainerRecord()->pCurContentArea->m_pFormNode;
   if (pContentArea == NULL) {
     pContentArea =
         pCurContentNode->GetNextSameClassSibling(XFA_ELEMENT_ContentArea);
     if (pContentArea == NULL) {
       return FALSE;
     }
   } else {
     if (pContentArea->GetNodeItem(XFA_NODEITEM_Parent) != m_pCurPageArea) {
       return FALSE;
     }
     CXFA_ContainerLayoutItem* pContentAreaLayout = NULL;
-    if (!XFA_LayoutPageMgr_CheckContentAreaNotUsed(
-            GetCurrentContainerRecord()->pCurPageArea, pContentArea,
-            pContentAreaLayout)) {
+    if (!CheckContentAreaNotUsed(GetCurrentContainerRecord()->pCurPageArea,
+                                 pContentArea, pContentAreaLayout)) {
       return FALSE;
     }
     if (pContentAreaLayout) {
       if (pContentAreaLayout->m_pFormNode != pCurContentNode) {
         CXFA_ContainerRecord* pNewRecord = CreateContainerRecord();
         pNewRecord->pCurContentArea = pContentAreaLayout;
         return TRUE;
       } else {
         return FALSE;
       }
@@ skipping 189 matching lines @@
   m_pCurPageArea = NULL;
   m_nCurPageCount = 0;
   m_bCreateOverFlowPage = FALSE;
   m_pPageSetMap.RemoveAll();
 }
 CXFA_LayoutItem* CXFA_LayoutPageMgr::FindOrCreateLayoutItem(
     CXFA_Node* pFormNode) {
   return pFormNode->GetDocument()->GetParser()->GetNotify()->OnCreateLayoutItem(
       pFormNode);
 }
-static void XFA_SyncRemoveLayoutItem(CXFA_LayoutItem* pParentLayoutItem,
-                                     CXFA_FFNotify* pNotify,
-                                     CXFA_LayoutProcessor* pDocLayout) {
-  CXFA_LayoutItem* pNextLayoutItem;
-  CXFA_LayoutItem* pCurLayoutItem = pParentLayoutItem->m_pFirstChild;
-  while (pCurLayoutItem) {
-    pNextLayoutItem = pCurLayoutItem->m_pNextSibling;
-    if (pCurLayoutItem->m_pFirstChild) {
-      XFA_SyncRemoveLayoutItem(pCurLayoutItem, pNotify, pDocLayout);
-    }
-    pNotify->OnLayoutItemRemoving(pDocLayout, pCurLayoutItem);
-    delete pCurLayoutItem;
-    pCurLayoutItem = pNextLayoutItem;
-  }
-}
+
 void CXFA_LayoutPageMgr::SaveLayoutItem(CXFA_LayoutItem* pParentLayoutItem) {
   CXFA_LayoutItem* pNextLayoutItem;
   CXFA_LayoutItem* pCurLayoutItem = pParentLayoutItem->m_pFirstChild;
   while (pCurLayoutItem) {
     pNextLayoutItem = pCurLayoutItem->m_pNextSibling;
     if (pCurLayoutItem->IsContentLayoutItem()) {
       uint32_t dwFlag = pCurLayoutItem->m_pFormNode->GetFlag();
       if (dwFlag & (XFA_NODEFLAG_HasRemoved)) {
         CXFA_FFNotify* pNotify =
             m_pTemplatePageSetRoot->GetDocument()->GetParser()->GetNotify();
         CXFA_LayoutProcessor* pDocLayout =
             m_pTemplatePageSetRoot->GetDocument()->GetDocLayout();
         if (pCurLayoutItem->m_pFirstChild) {
-          XFA_SyncRemoveLayoutItem(pCurLayoutItem, pNotify, pDocLayout);
+          SyncRemoveLayoutItem(pCurLayoutItem, pNotify, pDocLayout);
         }
         pNotify->OnLayoutItemRemoving(pDocLayout, pCurLayoutItem);
         delete pCurLayoutItem;
         pCurLayoutItem = pNextLayoutItem;
         continue;
       }
       if (dwFlag & XFA_NODEFLAG_LayoutGeneratedNode) {
         CXFA_NodeIteratorTemplate<CXFA_Node, CXFA_TraverseStrategy_XFANode>
             sIterator(pCurLayoutItem->m_pFormNode);
         for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode;
@@ skipping 243 matching lines @@
         case XFA_ELEMENT_PageArea:
           m_pLayoutProcessor->GetRootRootItemLayoutProcessor()
               ->DoLayoutPageArea(pContainerItem);
           break;
         default:
           break;
       }
     }
   }
 }
-void XFA_SyncContainer(CXFA_FFNotify* pNotify,
-                       CXFA_LayoutProcessor* pDocLayout,
-                       CXFA_LayoutItem* pContainerItem,
-                       uint32_t dwRelevant,
-                       FX_BOOL bVisible,
-                       int32_t nPageIndex) {
-  FX_BOOL bVisibleItem = FALSE;
-  uint32_t dwStatus = 0;
-  uint32_t dwRelevantContainer = 0;
-  if (bVisible) {
-    XFA_ATTRIBUTEENUM eAttributeValue =
-        pContainerItem->m_pFormNode->GetEnum(XFA_ATTRIBUTE_Presence);
-    if (eAttributeValue == XFA_ATTRIBUTEENUM_Visible ||
-        eAttributeValue == XFA_ATTRIBUTEENUM_Unknown) {
-      bVisibleItem = TRUE;
-    }
-    dwRelevantContainer =
-        XFA_GetRelevant(pContainerItem->m_pFormNode, dwRelevant);
-    dwStatus =
-        (bVisibleItem ? XFA_LAYOUTSTATUS_Visible : 0) | dwRelevantContainer;
-  }
-  pNotify->OnLayoutItemAdded(pDocLayout, pContainerItem, nPageIndex, dwStatus);
-  for (CXFA_LayoutItem* pChild = pContainerItem->m_pFirstChild; pChild;
-       pChild = pChild->m_pNextSibling) {
-    if (pChild->IsContentLayoutItem()) {
-      XFA_SyncContainer(pNotify, pDocLayout, pChild, dwRelevantContainer,
-                        bVisibleItem, nPageIndex);
-    }
-  }
-}
+
 void CXFA_LayoutPageMgr::SyncLayoutData() {
   MergePageSetContents();
   LayoutPageSetContents();
   CXFA_FFNotify* pNotify =
       m_pTemplatePageSetRoot->GetDocument()->GetParser()->GetNotify();
   int32_t nPageIdx = -1;
   CXFA_ContainerLayoutItem* pRootLayoutItem = GetRootLayoutItem();
   for (; pRootLayoutItem;
        pRootLayoutItem =
            (CXFA_ContainerLayoutItem*)pRootLayoutItem->m_pNextSibling) {
     CXFA_NodeIteratorTemplate<
         CXFA_ContainerLayoutItem,
         CXFA_TraverseStrategy_ContentAreaContainerLayoutItem>
         iteratorParent(pRootLayoutItem);
     for (CXFA_ContainerLayoutItem* pContainerItem = iteratorParent.GetCurrent();
          pContainerItem; pContainerItem = iteratorParent.MoveToNext()) {
       switch (pContainerItem->m_pFormNode->GetClassID()) {
         case XFA_ELEMENT_PageArea: {
           nPageIdx++;
           uint32_t dwRelevant =
-              XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable;
+              XFA_WidgetStatus_Viewable | XFA_WidgetStatus_Printable;
           CXFA_NodeIteratorTemplate<CXFA_LayoutItem,
                                     CXFA_TraverseStrategy_LayoutItem>
               iterator(pContainerItem);
           CXFA_LayoutItem* pChildLayoutItem = iterator.GetCurrent();
           while (pChildLayoutItem) {
             CXFA_ContentLayoutItem* pContentItem =
                 pChildLayoutItem->AsContentLayoutItem();
             if (!pContentItem) {
               pChildLayoutItem = iterator.MoveToNext();
               continue;
             }
             FX_BOOL bVisible =
                 (pContentItem->m_pFormNode->GetEnum(XFA_ATTRIBUTE_Presence) ==
                  XFA_ATTRIBUTEENUM_Visible);
             uint32_t dwRelevantChild =
-                XFA_GetRelevant(pContentItem->m_pFormNode, dwRelevant);
-            XFA_SyncContainer(pNotify, m_pLayoutProcessor, pContentItem,
-                              dwRelevantChild, bVisible, nPageIdx);
+                GetRelevant(pContentItem->m_pFormNode, dwRelevant);
+            SyncContainer(pNotify, m_pLayoutProcessor, pContentItem,
+                          dwRelevantChild, bVisible, nPageIdx);
             pChildLayoutItem = iterator.SkipChildrenAndMoveToNext();
           }
         } break;
         default:
           break;
       }
     }
   }
   int32_t nPage = m_PageArray.GetSize();
   for (int32_t i = nPage - 1; i >= m_nAvailPages; i--) {
@@ skipping 48 matching lines @@
   }
   pRootLayoutItem = m_pPageSetLayoutItemRoot;
   CXFA_ContainerLayoutItem* pNextLayout = NULL;
   for (; pRootLayoutItem; pRootLayoutItem = pNextLayout) {
     pNextLayout = (CXFA_ContainerLayoutItem*)pRootLayoutItem->m_pNextSibling;
     SaveLayoutItem(pRootLayoutItem);
     delete pRootLayoutItem;
   }
   m_pPageSetLayoutItemRoot = NULL;
 }