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;
 };
-
+#define PAGEVIEW_FLAG_VALID 0x01
+#define PAGEVIEW_FLAG_LOCK 0x02
+#define PAGEVIEW_FLAG_TAKEOVERPAGE 0x04
 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);
@@ skipping 47 matching lines @@
         //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;}
+        void SetValid(FX_BOOL bValid) {m_Flag |= PAGEVIEW_FLAG_VALID;}

[Tom Sepez, 2014/09/23 23:38:54]

nit: we should probably clean up the redundant public: private: public:
declarations by grouping them together appropriately, unless there's some reason
to avoid doing this

[Bo Xu, 2014/09/24 01:01:13]

Done.

+        FX_BOOL IsValid() {return m_Flag & PAGEVIEW_FLAG_VALID;}
+        void TakeOverPage() {m_Flag |= PAGEVIEW_FLAG_TAKEOVERPAGE;}
+        FX_BOOL IsLocked() {return m_Flag & PAGEVIEW_FLAG_LOCK;}
+        void SetLock() {m_Flag |= PAGEVIEW_FLAG_LOCK;}
+        void ClearLock() {m_Flag &= ~PAGEVIEW_FLAG_LOCK;}
 private:
-        FX_BOOL m_bValid;
+        FX_BOOL m_Flag;

[Tom Sepez, 2014/09/23 23:38:54]

How many of these objects are we going to have allocated at one time?  I might
be simpler just to have m_bValid, m_bLocked, and m_bTakeOverPage.

Then you can have 
  bool IsLocked();
  void SetLocked(bool locked);

instead of Set/Clear methods.

[Bo Xu, 2014/09/24 01:01:13]

Done.

 };
 
 
 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