diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-09-14 14:32:33 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-09-14 14:32:33 -0700 |
commit | 9a817f092e6800e9338b41acf4ea0416b6ad4467 (patch) | |
tree | c989a1abc1d24c108c7e8d869818368d373b1f00 /fpdfsdk/src | |
parent | da0938f8671958aba0522a69fc687a7bbb01b435 (diff) | |
download | pdfium-9a817f092e6800e9338b41acf4ea0416b6ad4467.tar.xz |
Get CJS_RuntimeFactory out of the CJS_GlobalData management business.
First part of getting rid of CJS_RuntimeFactory. The factory design
pattern isn't appropriate here since we only ever make one kind of
object.
CJS_GlobalData is now perfectly capable of managing itself through
internal ref counts. I'm philosophically opposed to keeping ref-counts
outside the object (do you hear me std::shared_ptr, you're bad!)
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1338993005 .
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r-- | fpdfsdk/src/javascript/JS_GlobalData.cpp | 39 | ||||
-rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime.cpp | 20 | ||||
-rw-r--r-- | fpdfsdk/src/javascript/global.cpp | 4 |
3 files changed, 24 insertions, 39 deletions
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index 0a21a9253c..807491854a 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -99,19 +99,31 @@ static const uint8_t JS_RC4KEY[] = { 0x0e, 0xd0, 0x6b, 0xbb, 0xd5, 0x75, 0x55, 0x8b, 0x6e, 0x6b, 0x19, 0xa0, 0xf8, 0x77, 0xd5, 0xa3}; -CJS_GlobalData::CJS_GlobalData(CPDFDoc_Environment* pApp) { - // IBaseAnnot* pBaseAnnot = IBaseAnnot::GetBaseAnnot(m_pApp); - // ASSERT(pBaseAnnot != NULL); - // - // m_sFilePath = pBaseAnnot->GetUserPath(); - m_sFilePath += SDK_JS_GLOBALDATA_FILENAME; +CJS_GlobalData* CJS_GlobalData::g_Instance = nullptr; + +// static +CJS_GlobalData* CJS_GlobalData::GetRetainedInstance(CPDFDoc_Environment* pApp) { + if (!g_Instance) { + g_Instance = new CJS_GlobalData(pApp); + } + ++g_Instance->m_RefCount; + return g_Instance; +} +void CJS_GlobalData::Release() { + if (!--m_RefCount) { + delete g_Instance; + g_Instance = nullptr; + } +} + +CJS_GlobalData::CJS_GlobalData(CPDFDoc_Environment* pApp) : m_RefCount(0) { + m_sFilePath += SDK_JS_GLOBALDATA_FILENAME; LoadGlobalPersistentVariables(); } CJS_GlobalData::~CJS_GlobalData() { SaveGlobalPersisitentVariables(); - for (int i = 0, sz = m_arrayGlobalData.GetSize(); i < sz; i++) delete m_arrayGlobalData.GetAt(i); @@ -119,19 +131,12 @@ CJS_GlobalData::~CJS_GlobalData() { } int CJS_GlobalData::FindGlobalVariable(const FX_CHAR* propname) { - ASSERT(propname != NULL); - - int nRet = -1; - for (int i = 0, sz = m_arrayGlobalData.GetSize(); i < sz; i++) { CJS_GlobalData_Element* pTemp = m_arrayGlobalData.GetAt(i); - if (pTemp->data.sKey[0] == *propname && pTemp->data.sKey == propname) { - nRet = i; - break; - } + if (pTemp->data.sKey[0] == *propname && pTemp->data.sKey == propname) + return i; } - - return nRet; + return -1; } CJS_GlobalData_Element* CJS_GlobalData::GetGlobalVariable( diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 4b18d80f6c..8ba7e81654 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -50,7 +50,6 @@ void CJS_RuntimeFactory::Release() { // to do.Should be implemented as atom manipulation. if (--m_nRef == 0) { JS_Release(); - ReleaseGlobalData(); m_bInit = FALSE; } } @@ -60,25 +59,6 @@ void CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtime* pRuntime) { delete (CJS_Runtime*)pRuntime; } -CJS_GlobalData* CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp) { - if (m_pGlobalData) { - m_nGlobalDataCount++; - return m_pGlobalData; - } - m_nGlobalDataCount = 1; - m_pGlobalData = new CJS_GlobalData(pApp); - return m_pGlobalData; -} - -void CJS_RuntimeFactory::ReleaseGlobalData() { - m_nGlobalDataCount--; - - if (m_nGlobalDataCount <= 0) { - delete m_pGlobalData; - m_pGlobalData = NULL; - } -} - void* CJS_ArrayBufferAllocator::Allocate(size_t length) { return calloc(1, length); } diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index bde4e7d5ae..e75dbd5585 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -108,12 +108,12 @@ JSGlobalAlternate::JSGlobalAlternate(CJS_Object* pJSObject) JSGlobalAlternate::~JSGlobalAlternate() { DestroyGlobalPersisitentVariables(); - m_pApp->GetRuntimeFactory()->ReleaseGlobalData(); + m_pGlobalData->Release(); } void JSGlobalAlternate::Initial(CPDFDoc_Environment* pApp) { m_pApp = pApp; - m_pGlobalData = pApp->GetRuntimeFactory()->NewGlobalData(pApp); + m_pGlobalData = CJS_GlobalData::GetRetainedInstance(pApp); UpdateGlobalPersistentVariables(); } |