summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-07-08 15:30:46 -0700
committerBo Xu <bo_xu@foxitsoftware.com>2014-07-08 15:30:46 -0700
commit3522876d5291922ddc62bf1b70d02743b0850673 (patch)
treeb3fd7eda6e8ed8f07674f6a6fba21e82ca83bee7 /fpdfsdk/src
parente7ee98e4c6fd56c9e930194e9fc11cc10e8293a1 (diff)
downloadpdfium-3522876d5291922ddc62bf1b70d02743b0850673.tar.xz
Remove custom memory manager
BUG= R=palmer@chromium.org Review URL: https://codereview.chromium.org/372473003
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/fpdfoom.cpp2
-rw-r--r--fpdfsdk/src/fpdfview.cpp8
2 files changed, 2 insertions, 8 deletions
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
}