diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2015-02-10 09:15:12 -0800 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2015-02-10 09:15:12 -0800 |
| commit | b045ed21ec797b5d05a6cef819451b0e8bfdee47 (patch) | |
| tree | 014af0644ce1e673619ac83cc06c75da4af6556e /fpdfsdk | |
| parent | 29e20e9d9c42122620b488340d4e78dfed6b0d34 (diff) | |
| download | pdfium-b045ed21ec797b5d05a6cef819451b0e8bfdee47.tar.xz | |
Merge https://codereview.chromium.org/897973002/ and https://codereview.chromium.org/902753002/ to XFA branch
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/887073005
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/include/javascript/IJavaScript.h | 7 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime.cpp | 10 |
2 files changed, 1 insertions, 16 deletions
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index fbd89d26f1..9d50b04e82 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -7,10 +7,6 @@ #ifndef _IJAVASCRIPT_H_ #define _IJAVASCRIPT_H_ -namespace v8 { -class Platform; -} - class IFXJS_Context { public: @@ -101,7 +97,7 @@ class CJS_GlobalData; class CJS_RuntimeFactory { public: - CJS_RuntimeFactory():m_bInit(FALSE),m_nRef(0),m_pGlobalData(NULL),m_nGlobalDataCount(0),m_platform(NULL) {} + CJS_RuntimeFactory():m_bInit(FALSE),m_nRef(0),m_pGlobalData(NULL),m_nGlobalDataCount(0) {} ~CJS_RuntimeFactory(); IFXJS_Runtime* NewJSRuntime(CPDFDoc_Environment* pApp); void DeleteJSRuntime(IFXJS_Runtime* pRuntime); @@ -115,7 +111,6 @@ private: int m_nRef; CJS_GlobalData* m_pGlobalData; FX_INT32 m_nGlobalDataCount; - v8::Platform* m_platform; }; #endif //_IJAVASCRIPT_H_ diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index cf06f9aba6..b0e80dd6b8 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -29,8 +29,6 @@ #include "../../include/fpdfxfa/fpdfxfa_app.h" #include "../../../xfa/src/fxjse/src/value.h" -#include <libplatform/libplatform.h> - CJS_RuntimeFactory::~CJS_RuntimeFactory() { } @@ -40,11 +38,6 @@ IFXJS_Runtime* CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp) if (!m_bInit) { JS_Initial(); -/* - m_platform = v8::platform::CreateDefaultPlatform(); - v8::V8::InitializePlatform(m_platform); - v8::V8::Initialize(); -*/ m_bInit = TRUE; } return new CJS_Runtime(pApp); @@ -63,9 +56,6 @@ void CJS_RuntimeFactory::Release() { JS_Release(); ReleaseGlobalData(); - v8::V8::ShutdownPlatform(); - delete m_platform; - m_platform = NULL; m_bInit = FALSE; } } |