| Index: fpdfsdk/include/fsdk_mgr.h
|
| diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
|
| index 409b49f6a94eea8500ad4a83e4b40e585be56d59..a314be8d872db90fefcc2ca10d93cfc57358927f 100644
|
| --- a/fpdfsdk/include/fsdk_mgr.h
|
| +++ b/fpdfsdk/include/fsdk_mgr.h
|
| @@ -8,6 +8,7 @@
|
| #define FPDFSDK_INCLUDE_FSDK_MGR_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "core/include/fpdftext/fpdf_text.h"
|
| #include "fsdk_actionhandler.h"
|
| @@ -20,7 +21,6 @@
|
| #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"
|
|
|
| class CFFL_IFormFiller;
|
| class CPDFSDK_ActionHandler;
|
| @@ -216,14 +216,14 @@ class CPDFDoc_Environment final {
|
| CPDFSDK_ActionHandler* GetActionHander(); // Creates if not present.
|
|
|
| private:
|
| - nonstd::unique_ptr<CPDFSDK_AnnotHandlerMgr> m_pAnnotHandlerMgr;
|
| - nonstd::unique_ptr<CPDFSDK_ActionHandler> m_pActionHandler;
|
| - nonstd::unique_ptr<IJS_Runtime> m_pJSRuntime;
|
| + std::unique_ptr<CPDFSDK_AnnotHandlerMgr> m_pAnnotHandlerMgr;
|
| + std::unique_ptr<CPDFSDK_ActionHandler> m_pActionHandler;
|
| + std::unique_ptr<IJS_Runtime> m_pJSRuntime;
|
| FPDF_FORMFILLINFO* const m_pInfo;
|
| CPDFSDK_Document* m_pSDKDoc;
|
| UnderlyingDocumentType* const m_pUnderlyingDoc;
|
| - nonstd::unique_ptr<CFFL_IFormFiller> m_pIFormFiller;
|
| - nonstd::unique_ptr<IFX_SystemHandler> m_pSysHandler;
|
| + std::unique_ptr<CFFL_IFormFiller> m_pIFormFiller;
|
| + std::unique_ptr<IFX_SystemHandler> m_pSysHandler;
|
| };
|
|
|
| class CPDFSDK_Document {
|
| @@ -283,10 +283,10 @@ class CPDFSDK_Document {
|
| private:
|
| std::map<UnderlyingPageType*, CPDFSDK_PageView*> m_pageMap;
|
| UnderlyingDocumentType* m_pDoc;
|
| - nonstd::unique_ptr<CPDFSDK_InterForm> m_pInterForm;
|
| + std::unique_ptr<CPDFSDK_InterForm> m_pInterForm;
|
| CPDFSDK_Annot* m_pFocusAnnot;
|
| CPDFDoc_Environment* m_pEnv;
|
| - nonstd::unique_ptr<CPDF_OCContext> m_pOccontent;
|
| + std::unique_ptr<CPDF_OCContext> m_pOccontent;
|
| FX_BOOL m_bChangeMask;
|
| FX_BOOL m_bBeingDestroyed;
|
| };
|
| @@ -354,7 +354,7 @@ class CPDFSDK_PageView final {
|
|
|
| CFX_Matrix m_curMatrix;
|
| UnderlyingPageType* m_page;
|
| - nonstd::unique_ptr<CPDF_AnnotList> m_pAnnotList;
|
| + std::unique_ptr<CPDF_AnnotList> m_pAnnotList;
|
| std::vector<CPDFSDK_Annot*> m_fxAnnotArray;
|
| CPDFSDK_Document* m_pSDKDoc;
|
| CPDFSDK_Widget* m_CaptureWidget;
|
|
|