summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/javascript
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-09-14 14:32:33 -0700
committerTom Sepez <tsepez@chromium.org>2015-09-14 14:32:33 -0700
commit9a817f092e6800e9338b41acf4ea0416b6ad4467 (patch)
treec989a1abc1d24c108c7e8d869818368d373b1f00 /fpdfsdk/include/javascript
parentda0938f8671958aba0522a69fc687a7bbb01b435 (diff)
downloadpdfium-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/include/javascript')
-rw-r--r--fpdfsdk/include/javascript/IJavaScript.h17
-rw-r--r--fpdfsdk/include/javascript/JS_GlobalData.h11
2 files changed, 13 insertions, 15 deletions
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index 18ab34b8cb..3524a5b8ff 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -10,10 +10,11 @@
#include "../../../core/include/fxcrt/fx_string.h"
#include "../../../core/include/fxcrt/fx_system.h"
-class CPDF_Bookmark;
-class CPDF_FormField;
+class CPDFDoc_Environment;
class CPDFSDK_Annot;
class CPDFSDK_Document;
+class CPDF_Bookmark;
+class CPDF_FormField;
class IFXJS_Context {
public:
@@ -143,27 +144,19 @@ class IFXJS_Runtime {
virtual ~IFXJS_Runtime() {}
};
-class CPDFDoc_Environment;
-class CJS_GlobalData;
-
class CJS_RuntimeFactory {
public:
- CJS_RuntimeFactory()
- : m_bInit(FALSE), m_nRef(0), m_pGlobalData(NULL), m_nGlobalDataCount(0) {}
+ CJS_RuntimeFactory() : m_bInit(FALSE), m_nRef(0) {}
~CJS_RuntimeFactory();
+
IFXJS_Runtime* NewJSRuntime(CPDFDoc_Environment* pApp);
void DeleteJSRuntime(IFXJS_Runtime* pRuntime);
void AddRef();
void Release();
- CJS_GlobalData* NewGlobalData(CPDFDoc_Environment* pApp);
- void ReleaseGlobalData();
-
private:
FX_BOOL m_bInit;
int m_nRef;
- CJS_GlobalData* m_pGlobalData;
- int32_t m_nGlobalDataCount;
};
#endif // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/JS_GlobalData.h b/fpdfsdk/include/javascript/JS_GlobalData.h
index 607eec79bd..98a963d87b 100644
--- a/fpdfsdk/include/javascript/JS_GlobalData.h
+++ b/fpdfsdk/include/javascript/JS_GlobalData.h
@@ -58,10 +58,9 @@ class CJS_GlobalData_Element {
class CJS_GlobalData {
public:
- CJS_GlobalData(CPDFDoc_Environment* pApp);
- virtual ~CJS_GlobalData();
+ static CJS_GlobalData* GetRetainedInstance(CPDFDoc_Environment* pApp);
+ void Release();
- public:
void SetGlobalVariableNumber(const FX_CHAR* propname, double dData);
void SetGlobalVariableBoolean(const FX_CHAR* propname, bool bData);
void SetGlobalVariableString(const FX_CHAR* propname,
@@ -78,6 +77,11 @@ class CJS_GlobalData {
CJS_GlobalData_Element* GetAt(int index) const;
private:
+ static CJS_GlobalData* g_Instance;
+
+ CJS_GlobalData(CPDFDoc_Environment* pApp);
+ ~CJS_GlobalData();
+
void LoadGlobalPersistentVariables();
void SaveGlobalPersisitentVariables();
@@ -95,6 +99,7 @@ class CJS_GlobalData {
CFX_BinaryBuf& sData);
private:
+ size_t m_RefCount;
CFX_ArrayTemplate<CJS_GlobalData_Element*> m_arrayGlobalData;
CFX_WideString m_sFilePath;
};