diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-14 15:06:53 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-14 15:06:53 -0700 |
| commit | f458362c167f29f37301f48b08eb8d916e69d40b (patch) | |
| tree | d1d53eb4e1fddee030d7ccbc05e19c80765260c3 /fpdfsdk/include/javascript/IJavaScript.h | |
| parent | 142165e2f62b8ba727e8aab40591ca3a7b6fa214 (diff) | |
| download | pdfium-f458362c167f29f37301f48b08eb8d916e69d40b.tar.xz | |
Merge to XFA: Get CJS_RuntimeFactory out of CJS_GlobalData management.
(cherry picked from commit 9a817f092e6800e9338b41acf4ea0416b6ad4467)
Original Review URL: https://codereview.chromium.org/1338993005 .
Small manual merge in
fpdfsdk/src/javascript/JS_GlobalData.cpp
fpdfsdk/src/javascript/global.cpp
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1341913002 .
Diffstat (limited to 'fpdfsdk/include/javascript/IJavaScript.h')
| -rw-r--r-- | fpdfsdk/include/javascript/IJavaScript.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index 3da2c1a002..d85fc6f109 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -11,10 +11,11 @@ #include "../../../core/include/fxcrt/fx_system.h" #include "../../../xfa/include/fxjse/fxjse.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: @@ -150,27 +151,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_ |