Lock page in LoadFXAnnot to prevent unintended page closing

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_MGR_H
 #define _FPDFSDK_MGR_H
 
 #include "fsdk_common.h"
@@ skipping 442 matching lines @@
         //CFX_ArrayTemplate<CPDFSDK_PageView*> m_pageArray;
         CFX_MapPtrTemplate<CPDF_Page*, CPDFSDK_PageView*> m_pageMap;
         CPDF_Document*                  m_pDoc;
 
         CPDFSDK_InterForm*              m_pInterForm;
         CPDFSDK_Annot*                  m_pFocusAnnot;
         CPDFDoc_Environment *   m_pEnv;
         CPDF_OCContext *                m_pOccontent;
         FX_BOOL                                 m_bChangeMask;
 };
-
 class CPDFSDK_PageView FX_FINAL
 {
 public:
         CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDF_Page* page);
         ~CPDFSDK_PageView();
-public:
         void PageView_OnDraw(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,CPDF_RenderOptions* pOptions) ;
-public:
         CPDF_Annot*                                             GetPDFAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
         CPDFSDK_Annot*                                  GetFXAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY);
         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);}
         FX_BOOL                                                 Annot_HasAppearance(CPDF_Annot* pAnnot);
 
         CPDFSDK_Annot*                                  AddAnnot(CPDF_Dictionary * pDict);
         CPDFSDK_Annot*                                  AddAnnot(FX_LPCSTR lpSubType,CPDF_Dictionary * pDict);
         CPDFSDK_Annot*                                  AddAnnot(CPDF_Annot * pPDFAnnot);
         FX_BOOL                                                 DeleteAnnot(CPDFSDK_Annot* pAnnot);                                                     
         
         int                                                             CountAnnots();
         CPDFSDK_Annot*                                  GetAnnot(int nIndex);
         CPDFSDK_Annot*                              GetAnnotByDict(CPDF_Dictionary * pDict);
         CPDF_Page*                                              GetPDFPage(){return m_page;}
         CPDF_Document*                                  GetPDFDocument();
         CPDFSDK_Document*                               GetSDKDocument() {return m_pSDKDoc;}    
-public:
         FX_BOOL                                 OnLButtonDown(const CPDF_Point & point, FX_UINT nFlag);
         FX_BOOL                                 OnLButtonUp(const CPDF_Point & point, FX_UINT nFlag);
         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);
         FX_BOOL                                 IsValidAnnot(FX_LPVOID p);
-public:
         void                                    GetCurrentMatrix(CPDF_Matrix& matrix) {matrix = m_curMatrix;}
         void                                    UpdateRects(CFX_RectArray& rects);
         void                                                    UpdateView(CPDFSDK_Annot* pAnnot);
         CFX_PtrArray*                                   GetAnnotList(){ return &m_fxAnnotArray; }
 
-public:
         int                                             GetPageIndex();
         void                                                    LoadFXAnnots();
-private:
-        CPDF_Matrix m_curMatrix;
 
+        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;}
+        void TakeOverPage() {m_bTakeOverPage = TRUE;}
 private:
         void PageView_OnHighlightFormFields(CFX_RenderDevice* pDevice, CPDFSDK_Widget* pWidget);
-
-private:
+        

[Tom Sepez, 2014/09/24 17:07:05]

Super-nit: line contains only whitespace (git cl patch complains about this).

+        CPDF_Matrix m_curMatrix;
         CPDF_Page* m_page;
         CPDF_AnnotList* m_pAnnotList;
-
         //CPDFSDK_Annot* m_pFocusAnnot;
         CFX_PtrArray  m_fxAnnotArray;
-
         CPDFSDK_Document* m_pSDKDoc;
-private:
         CPDFSDK_Widget* m_CaptureWidget;
         FX_BOOL m_bEnterWidget;
         FX_BOOL m_bExitWidget;
         FX_BOOL m_bOnWidget;
-public:
-        void SetValid(FX_BOOL bValid) {m_bValid = bValid;}
-        FX_BOOL IsValid() {return m_bValid;}
-private:
         FX_BOOL m_bValid;
+        FX_BOOL m_bLocked;
+        FX_BOOL m_bTakeOverPage;
 };
 
 
 template<class TYPE>
 class CGW_ArrayTemplate : public CFX_ArrayTemplate<TYPE>
 {
 public: 
         CGW_ArrayTemplate(){}
         virtual ~CGW_ArrayTemplate(){}
         
@@ skipping 66 matching lines @@
                 }
                 
                 if (nStartPos < m) QuickSort(nStartPos, m, bAscend, pCompare);
                 if (nStopPos > m) QuickSort(m, nStopPos, bAscend, pCompare);
         }
 };
 
 
 #endif //_FPDFSDK_MGR_H