XFA_WIDGETSTATUS, LAYOUTSTATUS and WIDGETFILTER cleanup.

xfa/fxfa/app/xfa_ffdocview.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/include/xfa_ffdocview.h"
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fxfa/app/xfa_ffbarcode.h"
@@ skipping 311 matching lines @@
   if (!pFormRoot) {
     return NULL;
   }
   return new CXFA_WidgetAccIterator(this, pFormRoot);
 }
 CXFA_FFWidget* CXFA_FFDocView::GetFocusWidget() {
   return m_pFocusWidget;
 }
 void CXFA_FFDocView::KillFocus() {
   if (m_pFocusWidget &&
-      (m_pFocusWidget->GetStatus() & XFA_WIDGETSTATUS_Focused)) {
+      (m_pFocusWidget->GetStatus() & XFA_WidgetStatus_Focused)) {
     (m_pFocusWidget)->OnKillFocus(NULL);
   }
   m_pFocusAcc = NULL;
   m_pFocusWidget = NULL;
   m_pOldFocusWidget = NULL;
 }
 FX_BOOL CXFA_FFDocView::SetFocus(CXFA_FFWidget* hWidget) {
   CXFA_FFWidget* pNewFocus = hWidget;
   if (m_pOldFocusWidget == pNewFocus) {
     return FALSE;
   }
   CXFA_FFWidget* pOldFocus = m_pOldFocusWidget;
   m_pOldFocusWidget = pNewFocus;
   if (pOldFocus) {
     if (m_pFocusWidget != m_pOldFocusWidget &&
-        (pOldFocus->GetStatus() & XFA_WIDGETSTATUS_Focused)) {
+        (pOldFocus->GetStatus() & XFA_WidgetStatus_Focused)) {
       m_pFocusWidget = pOldFocus;
       pOldFocus->OnKillFocus(pNewFocus);
-    } else if ((pOldFocus->GetStatus() & XFA_WIDGETSTATUS_Visible)) {
+    } else if ((pOldFocus->GetStatus() & XFA_WidgetStatus_Visible)) {
       if (!pOldFocus->IsLoaded()) {
         pOldFocus->LoadWidget();
       }
       pOldFocus->OnSetFocus(m_pFocusWidget);
       m_pFocusWidget = pOldFocus;
       pOldFocus->OnKillFocus(pNewFocus);
     }
   }
   if (m_pFocusWidget == m_pOldFocusWidget) {
     return FALSE;
   }
   pNewFocus = m_pOldFocusWidget;
   if (m_pListFocusWidget && pNewFocus == m_pListFocusWidget) {
     m_pFocusAcc = NULL;
     m_pFocusWidget = NULL;
     m_pListFocusWidget = NULL;
     m_pOldFocusWidget = NULL;
     return FALSE;
   }
-  if (pNewFocus && (pNewFocus->GetStatus() & XFA_WIDGETSTATUS_Visible)) {
+  if (pNewFocus && (pNewFocus->GetStatus() & XFA_WidgetStatus_Visible)) {
     if (!pNewFocus->IsLoaded()) {
       pNewFocus->LoadWidget();
     }
     pNewFocus->OnSetFocus(m_pFocusWidget);
   }
   m_pFocusAcc = pNewFocus ? pNewFocus->GetDataAcc() : NULL;
   m_pFocusWidget = pNewFocus;
   m_pOldFocusWidget = m_pFocusWidget;
   return TRUE;
 }
@@ skipping 455 matching lines @@
 CXFA_FFWidget* CXFA_FFDocWidgetIterator::MoveToLast() {
   return NULL;
 }
 CXFA_FFWidget* CXFA_FFDocWidgetIterator::MoveToNext() {
   CXFA_Node* pItem = m_pCurWidget ? m_ContentIterator.MoveToNext()
                                   : m_ContentIterator.GetCurrent();
   while (pItem) {
     if (CXFA_WidgetAcc* pAcc = (CXFA_WidgetAcc*)pItem->GetWidgetData()) {
       while ((m_pCurWidget = pAcc->GetNextWidget(NULL))) {
         if (!m_pCurWidget->IsLoaded() &&
-            (m_pCurWidget->GetStatus() & XFA_WIDGETSTATUS_Visible)) {
+            (m_pCurWidget->GetStatus() & XFA_WidgetStatus_Visible)) {
           m_pCurWidget->LoadWidget();
         }
         return m_pCurWidget;
       }
     }
     pItem = m_ContentIterator.MoveToNext();
   }
   return NULL;
 }
 CXFA_FFWidget* CXFA_FFDocWidgetIterator::MoveToPrevious() {
@@ skipping 40 matching lines @@
 CXFA_WidgetAcc* CXFA_WidgetAccIterator::GetCurrentWidgetAcc() {
   return NULL;
 }
 FX_BOOL CXFA_WidgetAccIterator::SetCurrentWidgetAcc(CXFA_WidgetAcc* hWidget) {
   return FALSE;
 }
 void CXFA_WidgetAccIterator::SkipTree() {
   m_ContentIterator.SkipChildrenAndMoveToNext();
   m_pCurWidgetAcc = NULL;
 }