Tidy ifdefs in fpdfsdk.

fpdfsdk/include/fsdk_baseannot.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_FSDK_BASEANNOT_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
 #else
 #include <ctime>
 #endif
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fxcrt/fx_basic.h"
 #include "fpdfsdk/include/fsdk_define.h"
-#ifndef PDF_ENABLE_XFA
-#include "fx_systemhandler.h"
-#else
 #include "fpdfsdk/include/fx_systemhandler.h"
-#endif
 
 class CPDFSDK_PageView;
 class CPDF_Annot;
 class CPDF_Page;
 class CPDF_Rect;
 class CPDF_Matrix;
 class CPDF_RenderOptions;
 class CFX_RenderDevice;
 
 #define CFX_IntArray CFX_ArrayTemplate<int>
@@ skipping 37 matching lines @@
   } dt;
 };
 
 class CPDFSDK_Annot {
  public:
   explicit CPDFSDK_Annot(CPDFSDK_PageView* pPageView);
   virtual ~CPDFSDK_Annot() {}
 
 #ifdef PDF_ENABLE_XFA
   virtual FX_BOOL IsXFAField() { return FALSE; }
+#endif  // PDF_ENABLE_XFA
 
-#endif
   virtual FX_FLOAT GetMinWidth() const;
   virtual FX_FLOAT GetMinHeight() const;
   // define layout order to 5.
   virtual int GetLayoutOrder() const { return 5; }
 
   virtual CPDF_Annot* GetPDFAnnot() const { return nullptr; }
+
 #ifdef PDF_ENABLE_XFA
   virtual IXFA_Widget* GetXFAWidget() const { return nullptr; }
-#endif
+#endif  // PDF_ENABLE_XFA
 
   virtual CFX_ByteString GetType() const { return ""; }
   virtual CFX_ByteString GetSubType() const { return ""; }
 
   virtual void SetRect(const CPDF_Rect& rect) {}
   virtual CPDF_Rect GetRect() const { return CPDF_Rect(); }
 
   virtual void Annot_OnDraw(CFX_RenderDevice* pDevice,
                             CPDF_Matrix* pUser2Device,
                             CPDF_RenderOptions* pOptions) {}
 
   UnderlyingPageType* GetUnderlyingPage();
   CPDF_Page* GetPDFPage();
 #ifdef PDF_ENABLE_XFA
   CPDFXFA_Page* GetPDFXFAPage();
-#endif
+#endif  // PDF_ENABLE_XFA
 
   void SetPage(CPDFSDK_PageView* pPageView) { m_pPageView = pPageView; }
   CPDFSDK_PageView* GetPageView() const { return m_pPageView; }
 
   // Tab Order
   int GetTabOrder();
   void SetTabOrder(int iTabOrder);
 
   // Selection
   FX_BOOL IsSelected();
   void SetSelected(FX_BOOL bSelected);
 
  protected:
   CPDFSDK_PageView* m_pPageView;
   FX_BOOL m_bSelected;
   int m_nTabOrder;
 };
 
 class CPDFSDK_BAAnnot : public CPDFSDK_Annot {
  public:
   CPDFSDK_BAAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView);
   ~CPDFSDK_BAAnnot() override {}
 
 #ifdef PDF_ENABLE_XFA
   FX_BOOL IsXFAField() override;
-#endif
+#endif  // PDF_ENABLE_XFA
+
   CFX_ByteString GetType() const override;
   CFX_ByteString GetSubType() const override;
   void SetRect(const CPDF_Rect& rect) override;
   CPDF_Rect GetRect() const override;
   CPDF_Annot* GetPDFAnnot() const override;
   void Annot_OnDraw(CFX_RenderDevice* pDevice,
                     CPDF_Matrix* pUser2Device,
                     CPDF_RenderOptions* pOptions) override;
 
   CPDF_Dictionary* GetAnnotDict() const;
@@ skipping 72 matching lines @@
                        const CFX_ByteString& sAPState = "");
 
  protected:
   CPDF_Annot* m_pAnnot;
 
  private:
   FX_BOOL CreateFormFiller();
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_