XFA_WIDGETSTATUS, LAYOUTSTATUS and WIDGETFILTER cleanup.

xfa/fxfa/app/xfa_ffpageview.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_ffpageview.h"
 
 #include "xfa/fde/fde_render.h"
 #include "xfa/fxfa/app/xfa_ffcheckbutton.h"
@@ skipping 51 matching lines @@
                    : (FX_FLOAT)devicePageRect.left;
       m.f = bFlipX ? (FX_FLOAT)devicePageRect.top
                    : (FX_FLOAT)devicePageRect.bottom();
       break;
     default:
       break;
   }
   pageMatrix = m;
 }
 
+bool PageWidgetFilter(CXFA_FFWidget* pWidget,
+                      uint32_t dwFilter,
+                      FX_BOOL bTraversal,
+                      FX_BOOL bIgnorerelevant) {
+  CXFA_WidgetAcc* pWidgetAcc = pWidget->GetDataAcc();
+
+  if (!!(dwFilter & XFA_WidgetStatus_Focused) &&
+      pWidgetAcc->GetClassID() != XFA_ELEMENT_Field) {
+    return false;
+  }
+
+  uint32_t dwStatus = pWidget->GetStatus();
+  if (bTraversal && (dwStatus & XFA_WidgetStatus_Disabled))
+    return false;
+  if (bIgnorerelevant)
+    return !!(dwStatus & XFA_WidgetStatus_Visible);
+
+  dwFilter &= (XFA_WidgetStatus_Visible | XFA_WidgetStatus_Viewable |
+               XFA_WidgetStatus_Printable);
+  return (dwFilter & dwStatus) == dwFilter;
+}
+
 }  // namespace
+
 CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea)
     : CXFA_ContainerLayoutItem(pPageArea), m_pDocView(pDocView) {}
 
 CXFA_FFPageView::~CXFA_FFPageView() {}
 
 CXFA_FFDocView* CXFA_FFPageView::GetDocView() const {
   return m_pDocView;
 }
 
 int32_t CXFA_FFPageView::GetPageViewIndex() const {
@@ skipping 20 matching lines @@
     uint32_t dwWidgetFilter) {
   switch (dwTraverseWay) {
     case XFA_TRAVERSEWAY_Tranvalse:
       return new CXFA_FFTabOrderPageWidgetIterator(this, dwWidgetFilter);
     case XFA_TRAVERSEWAY_Form:
       return new CXFA_FFPageWidgetIterator(this, dwWidgetFilter);
   }
   return nullptr;
 }
 
-static FX_BOOL XFA_PageWidgetFilter(CXFA_FFWidget* pWidget,
-                                    uint32_t dwFilter,
-                                    FX_BOOL bTraversal,
-                                    FX_BOOL bIgnorerelevant) {
-  CXFA_WidgetAcc* pWidgetAcc = pWidget->GetDataAcc();
-  uint32_t dwType = dwFilter & XFA_WIDGETFILTER_AllType;
-  if ((dwType == XFA_WIDGETFILTER_Field) &&
-      (pWidgetAcc->GetClassID() != XFA_ELEMENT_Field)) {
-    return FALSE;
-  }
-  uint32_t dwStatus = pWidget->GetStatus();
-  if (bTraversal && (dwStatus & XFA_WIDGETSTATUS_Disabled)) {
-    return FALSE;
-  }
-  if (bIgnorerelevant) {
-    return (dwStatus & XFA_WIDGETFILTER_Visible) != 0;
-  }
-  dwFilter &= (XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable |
-               XFA_WIDGETFILTER_Printable);
-  return (dwFilter & dwStatus) == dwFilter;
-}
 CXFA_FFPageWidgetIterator::CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView,
                                                      uint32_t dwFilter) {
   m_pPageView = pPageView;
   m_dwFilter = dwFilter;
   m_sIterator.Init(pPageView);
   m_bIgnorerelevant = ((CXFA_FFDoc*)m_pPageView->GetDocView()->GetDoc())
                           ->GetXFADoc()
                           ->GetCurVersionMode() < XFA_VERSION_205;
 }
 CXFA_FFPageWidgetIterator::~CXFA_FFPageWidgetIterator() {}
@@ skipping 35 matching lines @@
 CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetCurrentWidget() {
   CXFA_LayoutItem* pLayoutItem = m_sIterator.GetCurrent();
   return pLayoutItem ? XFA_GetWidgetFromLayoutItem(pLayoutItem) : NULL;
 }
 FX_BOOL CXFA_FFPageWidgetIterator::SetCurrentWidget(CXFA_FFWidget* hWidget) {
   return hWidget && m_sIterator.SetCurrent(hWidget);
 }
 CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetWidget(
     CXFA_LayoutItem* pLayoutItem) {
   if (CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem)) {
-    if (!XFA_PageWidgetFilter(pWidget, m_dwFilter, FALSE, m_bIgnorerelevant)) {
+    if (!PageWidgetFilter(pWidget, m_dwFilter, FALSE, m_bIgnorerelevant)) {
       return NULL;
     }
     if (!pWidget->IsLoaded() &&
-        (pWidget->GetStatus() & XFA_WIDGETSTATUS_Visible) != 0) {
+        (pWidget->GetStatus() & XFA_WidgetStatus_Visible) != 0) {
       pWidget->LoadWidget();
     }
     return pWidget;
   }
   return NULL;
 }
 
 CXFA_FFTabOrderPageWidgetIterator::CXFA_FFTabOrderPageWidgetIterator(
     CXFA_FFPageView* pPageView,
     uint32_t dwFilter)
     : m_pPageView(pPageView), m_dwFilter(dwFilter), m_iCurWidget(-1) {
   m_bIgnorerelevant = ((CXFA_FFDoc*)m_pPageView->GetDocView()->GetDoc())
                           ->GetXFADoc()
                           ->GetCurVersionMode() < XFA_VERSION_205;
   Reset();
 }
 
 CXFA_FFTabOrderPageWidgetIterator::~CXFA_FFTabOrderPageWidgetIterator() {}
 
 void CXFA_FFTabOrderPageWidgetIterator::Reset() {
   CreateTabOrderWidgetArray();
   m_iCurWidget = -1;
 }
 CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToFirst() {
   if (m_TabOrderWidgetArray.GetSize() > 0) {
     for (int32_t i = 0; i < m_TabOrderWidgetArray.GetSize(); i++) {
-      if (XFA_PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
-                               m_bIgnorerelevant)) {
+      if (PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
+                           m_bIgnorerelevant)) {
         m_iCurWidget = i;
         return m_TabOrderWidgetArray[m_iCurWidget];
       }
     }
   }
   return NULL;
 }
 CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToLast() {
   if (m_TabOrderWidgetArray.GetSize() > 0) {
     for (int32_t i = m_TabOrderWidgetArray.GetSize() - 1; i >= 0; i--) {
-      if (XFA_PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
-                               m_bIgnorerelevant)) {
+      if (PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
+                           m_bIgnorerelevant)) {
         m_iCurWidget = i;
         return m_TabOrderWidgetArray[m_iCurWidget];
       }
     }
   }
   return NULL;
 }
 CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToNext() {
   for (int32_t i = m_iCurWidget + 1; i < m_TabOrderWidgetArray.GetSize(); i++) {
-    if (XFA_PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
-                             m_bIgnorerelevant)) {
+    if (PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
+                         m_bIgnorerelevant)) {
       m_iCurWidget = i;
       return m_TabOrderWidgetArray[m_iCurWidget];
     }
   }
   m_iCurWidget = -1;
   return NULL;
 }
 CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToPrevious() {
   for (int32_t i = m_iCurWidget - 1; i >= 0; i--) {
-    if (XFA_PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
-                             m_bIgnorerelevant)) {
+    if (PageWidgetFilter(m_TabOrderWidgetArray[i], m_dwFilter, TRUE,
+                         m_bIgnorerelevant)) {
       m_iCurWidget = i;
       return m_TabOrderWidgetArray[m_iCurWidget];
     }
   }
   m_iCurWidget = -1;
   return NULL;
 }
 CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetCurrentWidget() {
   if (m_iCurWidget >= 0) {
     return m_TabOrderWidgetArray[m_iCurWidget];
@@ skipping 154 matching lines @@
   OrderContainer(&sIterator, NULL, pParam, bCurrentItem, bContentArea, TRUE);
   if (pParam->m_Children.GetSize() > 0) {
     WidgetArray.Append(pParam->m_Children);
   }
   delete pParam;
 }
 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;
   }
   return NULL;
 }