XFA_WIDGETSTATUS, LAYOUTSTATUS and WIDGETFILTER cleanup.

xfa/fxfa/app/xfa_ffpageview.cpp

Index: xfa/fxfa/app/xfa_ffpageview.cpp
diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp
index f1898c83f1153d3c1ffed022e07d088d1429888d..bd37c7b64eef3c66bad7fb25a3c608b8d3475112 100644
--- a/xfa/fxfa/app/xfa_ffpageview.cpp
+++ b/xfa/fxfa/app/xfa_ffpageview.cpp
@@ -121,7 +121,7 @@ static FX_BOOL XFA_PageWidgetFilter(CXFA_FFWidget* pWidget,
     return FALSE;
   }
   uint32_t dwStatus = pWidget->GetStatus();
-  if (bTraversal && (dwStatus & XFA_WIDGETSTATUS_Disabled)) {
+  if (bTraversal && (dwStatus & XFA_WidgetStatus_Disabled)) {
     return FALSE;
   }
   if (bIgnorerelevant) {
@@ -190,7 +190,7 @@ CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetWidget(
       return NULL;
     }
     if (!pWidget->IsLoaded() &&
-        (pWidget->GetStatus() & XFA_WIDGETSTATUS_Visible) != 0) {
+        (pWidget->GetStatus() & XFA_WidgetStatus_Visible) != 0) {
       pWidget->LoadWidget();
     }
     return pWidget;
@@ -427,7 +427,7 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetWidget(
     CXFA_LayoutItem* pLayoutItem) {
   if (CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem)) {
     if (!pWidget->IsLoaded() &&
-        (pWidget->GetStatus() & XFA_WIDGETSTATUS_Visible)) {
+        (pWidget->GetStatus() & XFA_WidgetStatus_Visible)) {
       pWidget->LoadWidget();
     }
     return pWidget;