Tidy ifdefs in fpdfsdk.

fpdfsdk/include/formfiller/FFL_IFormFiller.h

 // 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
 
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 
 #include <map>
@@ skipping 115 matching lines @@
   void OnPreOpen(CPDFSDK_Widget* pWidget,
                  CPDFSDK_PageView* pPageView,
                  FX_BOOL& bReset,
                  FX_BOOL& bExit,
                  FX_UINT nFlag);
   void OnPostOpen(CPDFSDK_Widget* pWidget,
                   CPDFSDK_PageView* pPageView,
                   FX_BOOL& bReset,
                   FX_BOOL& bExit,
                   FX_UINT nFlag);
-#endif
+#endif  // PDF_ENABLE_XFA
 
  private:
   using CFFL_Widget2Filler = std::map<CPDFSDK_Annot*, CFFL_FormFiller*>;
 
   // IPWL_Filler_Notify:
   void QueryWherePopup(void* pPrivateData,
                        FX_FLOAT fPopupMin,
                        FX_FLOAT fPopupMax,
                        int32_t& nRet,
                        FX_FLOAT& fPopupRet) override;
   void OnBeforeKeyStroke(void* pPrivateData,
                          CFX_WideString& strChange,
                          const CFX_WideString& strChangeEx,
                          int nSelStart,
                          int nSelEnd,
                          FX_BOOL bKeyDown,
                          FX_BOOL& bRC,
                          FX_BOOL& bExit,
                          FX_DWORD nFlag) override;
 #ifdef PDF_ENABLE_XFA
   void OnPopupPreOpen(void* pPrivateData,
                       FX_BOOL& bExit,
                       FX_DWORD nFlag) override;
   void OnPopupPostOpen(void* pPrivateData,
                        FX_BOOL& bExit,
                        FX_DWORD nFlag) override;
-#endif
-
-  void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot);
-#ifdef PDF_ENABLE_XFA
   void SetFocusAnnotTab(CPDFSDK_Annot* pWidget,
                         FX_BOOL bSameField,
                         FX_BOOL bNext);
-#endif
+#endif  // PDF_ENABLE_XFA
+  void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot);
 
   CPDFDoc_Environment* m_pApp;
   CFFL_Widget2Filler m_Maps;
   FX_BOOL m_bNotifying;
 };
 
 class CFFL_PrivateData {
  public:
   CPDFSDK_Widget* pWidget;
   CPDFSDK_PageView* pPageView;
   int nWidgetAge;
   int nValueAge;
 };
 
 #endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_