From 3522876d5291922ddc62bf1b70d02743b0850673 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Tue, 8 Jul 2014 15:30:46 -0700 Subject: Remove custom memory manager BUG= R=palmer@chromium.org Review URL: https://codereview.chromium.org/372473003 --- fpdfsdk/src/fpdfoom.cpp | 2 +- fpdfsdk/src/fpdfview.cpp | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/fpdfoom.cpp b/fpdfsdk/src/fpdfoom.cpp index 9ba983b942..2b202ba2eb 100644 --- a/fpdfsdk/src/fpdfoom.cpp +++ b/fpdfsdk/src/fpdfoom.cpp @@ -7,7 +7,7 @@ #include "../include/fsdk_define.h" #include "../include/fpdfoom.h" -void OOM_Handler(FXMEM_FoxitMgr* pFoxitMgr, void* param) +void OOM_Handler(void* param) { if (!param) return; ((OOM_INFO*)param)->FSDK_OOM_Handler((OOM_INFO*)param); diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index a5ba796158..10eaf5d980 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -96,9 +96,6 @@ FPDF_BOOL FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy) CPDF_ModuleMgr* g_pModuleMgr = NULL; #else CCodec_ModuleMgr* g_pCodecModule = NULL; -#ifdef _FXSDK_OPENSOURCE_ - FXMEM_FoxitMgr* g_pFoxitMgr = NULL; -#endif #endif //extern CPDFSDK_FormFillApp* g_pFormFillApp; @@ -161,9 +158,6 @@ DLLEXPORT void STDCALL FPDF_InitLibrary(FX_LPVOID hInstance) g_pModuleMgr->InitDesktop(); #endif #else -#ifdef _FXSDK_OPENSOURCE_ - g_pFoxitMgr = FXMEM_CreateMemoryMgr(1024 * 1024 * 32, TRUE); -#endif g_pCodecModule = CCodec_ModuleMgr::Create(); CFX_GEModule::Create(); @@ -225,7 +219,7 @@ DLLEXPORT void STDCALL FPDF_DestroyLibrary() #ifndef _FXSDK_OPENSOURCE_ FXMEM_CollectAll(FXMEM_GetDefaultMgr()); #else - FXMEM_DestroyFoxitMgr(g_pFoxitMgr); + #endif } -- cgit v1.2.3