Tidy ifdefs in fpdfsdk.

fpdfsdk/include/fsdk_mgr.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_MGR_H_
 #define FPDFSDK_INCLUDE_FSDK_MGR_H_
 
 #include <map>
 
 #include "core/include/fpdftext/fpdf_text.h"
-#ifdef PDF_ENABLE_XFA
-#include "fpdfxfa/fpdfxfa_doc.h"
-#include "fpdfxfa/fpdfxfa_page.h"
-#endif
 #include "fsdk_actionhandler.h"
 #include "fsdk_annothandler.h"
 #include "fsdk_baseannot.h"
 #include "fsdk_baseform.h"
 #include "fsdk_common.h"
 #include "fsdk_define.h"
 #include "fx_systemhandler.h"
 #include "javascript/IJavaScript.h"
 #include "public/fpdf_formfill.h"
 #include "public/fpdf_fwlevent.h"  // cross platform keycode and events define.
 #include "third_party/base/nonstd_unique_ptr.h"
 
+#ifdef PDF_ENABLE_XFA
+#include "fpdfxfa/fpdfxfa_doc.h"
+#include "fpdfxfa/fpdfxfa_page.h"
+#endif  // PDF_ENABLE_XFA
+
 class CFFL_IFormFiller;
 class CPDFSDK_ActionHandler;
 class CPDFSDK_Annot;
 class CPDFSDK_Document;
 class CPDFSDK_InterForm;
 class CPDFSDK_PageView;
 class CPDFSDK_Widget;
 class IFX_SystemHandler;
 
 class CPDFDoc_Environment final {
  public:
   CPDFDoc_Environment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo);
   ~CPDFDoc_Environment();
 
 #ifdef PDF_ENABLE_XFA
   void Release() {
     if (m_pInfo && m_pInfo->Release)
       m_pInfo->Release(m_pInfo);
     delete this;
   }
+#endif  // PDF_ENABLE_XFA
 
-#endif
   void FFI_Invalidate(FPDF_PAGE page,
                       double left,
                       double top,
                       double right,
                       double bottom) {
     if (m_pInfo && m_pInfo->FFI_Invalidate)
       m_pInfo->FFI_Invalidate(m_pInfo, page, left, top, right, bottom);
   }
 
   void FFI_OutputSelectedRect(FPDF_PAGE page,
@@ skipping 382 matching lines @@
       }
       CFX_ByteString bsRet = CFX_ByteString(pbuff, nActualLen);
       CFX_WideString wsRet = CFX_WideString::FromUTF16LE(
           (unsigned short*)bsRet.GetBuffer(bsRet.GetLength()),
           bsRet.GetLength() / sizeof(unsigned short));
       delete[] pbuff;
       return wsRet;
     }
     return L"";
   }
+#endif  // PDF_ENABLE_XFA
 
-#endif
   FX_BOOL IsJSInitiated() const { return m_pInfo && m_pInfo->m_pJsPlatform; }
   void SetSDKDocument(CPDFSDK_Document* pFXDoc) { m_pSDKDoc = pFXDoc; }
   CPDFSDK_Document* GetSDKDocument() const { return m_pSDKDoc; }
   UnderlyingDocumentType* GetUnderlyingDocument() const {
     return m_pUnderlyingDoc;
   }
   CFX_ByteString GetAppName() const { return ""; }
   IFX_SystemHandler* GetSysHandler() const { return m_pSysHandler.get(); }
   FPDF_FORMFILLINFO* GetFormFillInfo() const { return m_pInfo; }
 
@@ skipping 16 matching lines @@
 class CPDFSDK_Document {
  public:
   CPDFSDK_Document(UnderlyingDocumentType* pDoc, CPDFDoc_Environment* pEnv);
   ~CPDFSDK_Document();
 
   CPDFSDK_InterForm* GetInterForm();
 
   // Gets the document object for the next layer down; for master this is
   // a CPDF_Document, but for XFA it is a CPDFXFA_Document.
   UnderlyingDocumentType* GetUnderlyingDocument() const {
-#ifndef PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
+    return GetXFADocument();
+#else   // PDF_ENABLE_XFA
     return GetPDFDocument();
-#else
-    return GetXFADocument();
-#endif
+#endif  // PDF_ENABLE_XFA
   }
 
   // Gets the CPDF_Document, either directly in master, or from the
   // CPDFXFA_Document for XFA.
-#ifndef PDF_ENABLE_XFA
-  CPDF_Document* GetPDFDocument() const { return m_pDoc; }
-#else
   CPDF_Document* GetPDFDocument() const {
+#ifdef PDF_ENABLE_XFA
     return m_pDoc ? m_pDoc->GetPDFDoc() : nullptr;
+#else   // PDF_ENABLE_XFA
+    return m_pDoc;
+#endif  // PDF_ENABLE_XFA
   }
 
+#ifdef PDF_ENABLE_XFA
   // Gets the XFA document directly (XFA-only).
   CPDFXFA_Document* GetXFADocument() const { return m_pDoc; }
-#endif
 
-#ifdef PDF_ENABLE_XFA
   int GetPageViewCount() const { return m_pageMap.size(); }
-#endif
+#endif  // PDF_ENABLE_XFA
+
   CPDFSDK_PageView* GetPageView(UnderlyingPageType* pPage,
                                 FX_BOOL ReNew = TRUE);
   CPDFSDK_PageView* GetPageView(int nIndex);
   CPDFSDK_PageView* GetCurrentView();
   void RemovePageView(UnderlyingPageType* pPage);
   void UpdateAllViews(CPDFSDK_PageView* pSender, CPDFSDK_Annot* pAnnot);
 
   CPDFSDK_Annot* GetFocusAnnot();
 
   IJS_Runtime* GetJsRuntime();
@@ skipping 31 matching lines @@
   CPDFSDK_Annot* m_pFocusAnnot;
   CPDFDoc_Environment* m_pEnv;
   nonstd::unique_ptr<CPDF_OCContext> m_pOccontent;
   FX_BOOL m_bChangeMask;
   FX_BOOL m_bBeingDestroyed;
 };
 class CPDFSDK_PageView final {
  public:
   CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc, UnderlyingPageType* page);
   ~CPDFSDK_PageView();
+
+#ifdef PDF_ENABLE_XFA
   void PageView_OnDraw(CFX_RenderDevice* pDevice,
                        CPDF_Matrix* pUser2Device,
-#ifndef PDF_ENABLE_XFA
-                       CPDF_RenderOptions* pOptions);
-#else
                        CPDF_RenderOptions* pOptions,
                        const FX_RECT& pClip);
-#endif
+#else   // PDF_ENABLE_XFA
+  void PageView_OnDraw(CFX_RenderDevice* pDevice,
+                       CPDF_Matrix* pUser2Device,
+                       CPDF_RenderOptions* pOptions);
+#endif  // PDF_ENABLE_XFA
+
   const CPDF_Annot* GetPDFAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
   CPDFSDK_Annot* GetFXAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
   const CPDF_Annot* GetPDFWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
   CPDFSDK_Annot* GetFXWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
   CPDFSDK_Annot* GetFocusAnnot();
   void SetFocusAnnot(CPDFSDK_Annot* pSDKAnnot, FX_UINT nFlag = 0) {
     m_pSDKDoc->SetFocusAnnot(pSDKAnnot, nFlag);
   }
   FX_BOOL KillFocusAnnot(FX_UINT nFlag = 0) {
     return m_pSDKDoc->KillFocusAnnot(nFlag);
   }
   void KillFocusAnnotIfNeeded();
   FX_BOOL Annot_HasAppearance(CPDF_Annot* pAnnot);
 
   CPDFSDK_Annot* AddAnnot(CPDF_Dictionary* pDict);
   CPDFSDK_Annot* AddAnnot(const FX_CHAR* lpSubType, CPDF_Dictionary* pDict);
   CPDFSDK_Annot* AddAnnot(CPDF_Annot* pPDFAnnot);
-#ifdef PDF_ENABLE_XFA
-  CPDFSDK_Annot* AddAnnot(IXFA_Widget* pPDFAnnot);
-#endif
+
   FX_BOOL DeleteAnnot(CPDFSDK_Annot* pAnnot);
   size_t CountAnnots() const;
   CPDFSDK_Annot* GetAnnot(size_t nIndex);
   CPDFSDK_Annot* GetAnnotByDict(CPDF_Dictionary* pDict);
-#ifndef PDF_ENABLE_XFA
-  CPDF_Page* GetPDFPage() { return m_page; }
-#else
+
+#ifdef PDF_ENABLE_XFA
+  CPDFSDK_Annot* AddAnnot(IXFA_Widget* pPDFAnnot);
   CPDFSDK_Annot* GetAnnotByXFAWidget(IXFA_Widget* hWidget);
   CPDFXFA_Page* GetPDFXFAPage() { return m_page; }
   CPDF_Page* GetPDFPage();
-#endif
+#else
+  CPDF_Page* GetPDFPage() { return m_page; }
+#endif  // PDF_ENABLE_XFA
+
   CPDF_Document* GetPDFDocument();
   CPDFSDK_Document* GetSDKDocument() { return m_pSDKDoc; }
   FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_UINT nFlag);
   FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_UINT nFlag);
 #ifdef PDF_ENABLE_XFA
   FX_BOOL OnRButtonDown(const CPDF_Point& point, FX_UINT nFlag);
   FX_BOOL OnRButtonUp(const CPDF_Point& point, FX_UINT nFlag);
-#endif
+#endif  // PDF_ENABLE_XFA
   FX_BOOL OnChar(int nChar, FX_UINT nFlag);
   FX_BOOL OnKeyDown(int nKeyCode, int nFlag);
   FX_BOOL OnKeyUp(int nKeyCode, int nFlag);
 
   FX_BOOL OnMouseMove(const CPDF_Point& point, int nFlag);
   FX_BOOL OnMouseWheel(double deltaX,
                        double deltaY,
                        const CPDF_Point& point,
                        int nFlag);
   bool IsValidAnnot(const CPDF_Annot* p) const;
   void GetCurrentMatrix(CPDF_Matrix& matrix) { matrix = m_curMatrix; }
   void UpdateRects(CFX_RectArray& rects);
   void UpdateView(CPDFSDK_Annot* pAnnot);
   const std::vector<CPDFSDK_Annot*>& GetAnnotList() const {
     return m_fxAnnotArray;
   }
 
   int GetPageIndex();
   void LoadFXAnnots();
   void SetValid(FX_BOOL bValid) { m_bValid = bValid; }
   FX_BOOL IsValid() { return m_bValid; }
   void SetLock(FX_BOOL bLocked) { m_bLocked = bLocked; }
   FX_BOOL IsLocked() { return m_bLocked; }
 #ifndef PDF_ENABLE_XFA
   void TakeOverPage() { m_bTakeOverPage = TRUE; }
-#endif
+#endif  // PDF_ENABLE_XFA
 
  private:
   void PageView_OnHighlightFormFields(CFX_RenderDevice* pDevice,
                                       CPDFSDK_Widget* pWidget);
 
   CPDF_Matrix m_curMatrix;
   UnderlyingPageType* m_page;
   nonstd::unique_ptr<CPDF_AnnotList> m_pAnnotList;
   std::vector<CPDFSDK_Annot*> m_fxAnnotArray;
   CPDFSDK_Document* m_pSDKDoc;
-#ifndef PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
+  CPDFSDK_Annot* m_CaptureWidget;
+#else  // PDF_ENABLE_XFA
   CPDFSDK_Widget* m_CaptureWidget;
-#else
-  CPDFSDK_Annot* m_CaptureWidget;
-#endif
+  FX_BOOL m_bTakeOverPage;
+#endif  // PDF_ENABLE_XFA
   FX_BOOL m_bEnterWidget;
   FX_BOOL m_bExitWidget;
   FX_BOOL m_bOnWidget;
   FX_BOOL m_bValid;
   FX_BOOL m_bLocked;
-#ifndef PDF_ENABLE_XFA
-  FX_BOOL m_bTakeOverPage;
-#endif
 };
 
 template <class TYPE>
 class CGW_ArrayTemplate : public CFX_ArrayTemplate<TYPE> {
  public:
   CGW_ArrayTemplate() {}
   ~CGW_ArrayTemplate() {}
 
   typedef int (*LP_COMPARE)(TYPE p1, TYPE p2);
 
@@ skipping 56 matching lines @@
     }
 
     if (nStartPos < m)
       QuickSort(nStartPos, m, bAscend, pCompare);
     if (nStopPos > m)
       QuickSort(m, nStopPos, bAscend, pCompare);
   }
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_MGR_H_