XFA_WIDGETSTATUS, LAYOUTSTATUS and WIDGETFILTER cleanup.

fpdfsdk/fsdk_annothandler.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 "fpdfsdk/include/fsdk_annothandler.h"
 
 #include <algorithm>
 #include <vector>
@@ skipping 360 matching lines @@
     return NULL;
   if (pPage->GetPDFPage()) {  // for pdf annots.
     CBA_AnnotIterator ai(pSDKAnnot->GetPageView(), pSDKAnnot->GetType(), "");
     CPDFSDK_Annot* pNext =
         bNext ? ai.GetNextAnnot(pSDKAnnot) : ai.GetPrevAnnot(pSDKAnnot);
     return pNext;
   }
   // for xfa annots
   std::unique_ptr<IXFA_WidgetIterator> pWidgetIterator(
       pPage->GetXFAPageView()->CreateWidgetIterator(
-          XFA_TRAVERSEWAY_Tranvalse, XFA_WIDGETFILTER_Visible |
-                                         XFA_WIDGETFILTER_Viewable |
-                                         XFA_WIDGETFILTER_Field));
+          XFA_TRAVERSEWAY_Tranvalse, XFA_WidgetStatus_Visible |
+                                         XFA_WidgetStatus_Viewable |
+                                         XFA_WidgetStatus_Focused));
   if (!pWidgetIterator)
     return nullptr;
   if (pWidgetIterator->GetCurrentWidget() != pSDKAnnot->GetXFAWidget())
     pWidgetIterator->SetCurrentWidget(pSDKAnnot->GetXFAWidget());
   CXFA_FFWidget* hNextFocus =
       bNext ? pWidgetIterator->MoveToNext() : pWidgetIterator->MoveToPrevious();
   if (!hNextFocus && pSDKAnnot)
     hNextFocus = pWidgetIterator->MoveToFirst();
 
   return pPageView->GetAnnotByXFAWidget(hNextFocus);
@@ skipping 379 matching lines @@
   delete pWidget;
 }
 
 CFX_FloatRect CPDFSDK_XFAAnnotHandler::GetViewBBox(CPDFSDK_PageView* pPageView,
                                                    CPDFSDK_Annot* pAnnot) {
   ASSERT(pAnnot);
 
   CFX_RectF rcBBox;
   XFA_ELEMENT eType = pAnnot->GetXFAWidget()->GetDataAcc()->GetUIType();
   if (eType == XFA_ELEMENT_Signature)
-    pAnnot->GetXFAWidget()->GetBBox(rcBBox, XFA_WIDGETSTATUS_Visible, TRUE);
+    pAnnot->GetXFAWidget()->GetBBox(rcBBox, XFA_WidgetStatus_Visible, TRUE);
   else
-    pAnnot->GetXFAWidget()->GetBBox(rcBBox, 0);
+    pAnnot->GetXFAWidget()->GetBBox(rcBBox, XFA_WidgetStatus_None);
 
   CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.left + rcBBox.width,
                          rcBBox.top + rcBBox.height);
   rcWidget.left -= 1.0f;
   rcWidget.right += 1.0f;
   rcWidget.bottom -= 1.0f;
   rcWidget.top += 1.0f;
 
   return rcWidget;
 }
@@ skipping 295 matching lines @@
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::PrevAnnot() {
   if (m_pos < m_iteratorAnnotList.size())
     return m_iteratorAnnotList[m_iteratorAnnotList.size() - ++m_pos];
   return nullptr;
 }
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::Next() {
   return m_bReverse ? PrevAnnot() : NextAnnot();
 }