XFA_WIDGETSTATUS, LAYOUTSTATUS and WIDGETFILTER cleanup.

xfa/fxfa/app/xfa_rendercontext.cpp

Index: xfa/fxfa/app/xfa_rendercontext.cpp
diff --git a/xfa/fxfa/app/xfa_rendercontext.cpp b/xfa/fxfa/app/xfa_rendercontext.cpp
index e7bacec281d9aac23d3a082d1c544aa579358271..7bfd9630cb0ad615526f9a0dad84df478c4d72b1 100644
--- a/xfa/fxfa/app/xfa_rendercontext.cpp
+++ b/xfa/fxfa/app/xfa_rendercontext.cpp
@@ -38,10 +38,10 @@ int32_t CXFA_RenderContext::StartRender(CXFA_FFPageView* pPageView,
   mtRes.SetReverse(matrix);
   m_rtClipRect.Set(rtPage.left, rtPage.top, rtPage.width, rtPage.height);
   mtRes.TransformRect(m_rtClipRect);
-  m_dwStatus = m_options.m_bHighlight ? XFA_WIDGETSTATUS_Highlight : 0;
-  uint32_t dwFilterType = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_AllType |
-                          (m_options.m_bPrint ? XFA_WIDGETSTATUS_Printable
-                                              : XFA_WIDGETSTATUS_Viewable);
+  m_dwStatus = m_options.m_bHighlight ? XFA_WidgetStatus_Highlight : 0;
+  uint32_t dwFilterType = XFA_WidgetStatus_Visible |
+                          (m_options.m_bPrint ? XFA_WidgetStatus_Printable
+                                              : XFA_WidgetStatus_Viewable);
   m_pWidgetIterator =
       m_pPageView->CreateWidgetIterator(XFA_TRAVERSEWAY_Form, dwFilterType);
   m_pWidget = m_pWidgetIterator->MoveToNext();
@@ -52,7 +52,7 @@ int32_t CXFA_RenderContext::DoRender(IFX_Pause* pPause) {
   while (m_pWidget) {
     CXFA_FFWidget* pWidget = (CXFA_FFWidget*)m_pWidget;
     CFX_RectF rtWidgetBox;
-    pWidget->GetBBox(rtWidgetBox, XFA_WIDGETSTATUS_Visible);
+    pWidget->GetBBox(rtWidgetBox, XFA_WidgetStatus_Visible);
     rtWidgetBox.width += 1;
     rtWidgetBox.height += 1;
     if (rtWidgetBox.IntersectWith(m_rtClipRect)) {