diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-09-01 09:51:10 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-09-01 09:51:10 -0700 |
| commit | 9ed941a3709dc27ab8c7b27941197c6238f201a3 (patch) | |
| tree | 929cf2ab538aca70a0544bfd633796c345c64ef1 /fpdfsdk/include | |
| parent | aecd9d0c5cfc569269bfe6cc228efaab76a7bb1b (diff) | |
| download | pdfium-9ed941a3709dc27ab8c7b27941197c6238f201a3.tar.xz | |
Merge to XFA: CJS_Context::compile unused
Manual merge in fpdfsdk/src/javascript/JS_Context.cpp
(cherry picked from commit 6e945a1ebbacde3ed2a4fc83ccb7215ccbc46931)
Original Review URL: https://codereview.chromium.org/1318543012 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1318343004 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/javascript/IJavaScript.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Context.h | 10 | ||||
| -rw-r--r-- | fpdfsdk/include/jsapi/fxjs_v8.h | 5 |
3 files changed, 3 insertions, 14 deletions
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index 9c232b01fb..3da2c1a002 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -18,8 +18,6 @@ class CPDFSDK_Document; class IFXJS_Context { public: - virtual FX_BOOL Compile(const CFX_WideString& script, - CFX_WideString& info) = 0; virtual FX_BOOL RunScript(const CFX_WideString& script, CFX_WideString& info) = 0; diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h index 995d32219e..d5b1064cfc 100644 --- a/fpdfsdk/include/javascript/JS_Context.h +++ b/fpdfsdk/include/javascript/JS_Context.h @@ -16,11 +16,10 @@ class CJS_Runtime; class CJS_Context : public IFXJS_Context { public: - CJS_Context(CJS_Runtime* pRuntime); + explicit CJS_Context(CJS_Runtime* pRuntime); ~CJS_Context() override; // IFXJS_Context - FX_BOOL Compile(const CFX_WideString& script, CFX_WideString& info) override; FX_BOOL RunScript(const CFX_WideString& script, CFX_WideString& info) override; void OnApp_Init() override; @@ -124,11 +123,8 @@ class CJS_Context : public IFXJS_Context { FX_BOOL IsMsgBoxEnabled() const { return m_bMsgBoxEnable; } CPDFDoc_Environment* GetReaderApp(); - CJS_Runtime* GetJSRuntime() { return m_pRuntime; } - - FX_BOOL DoJob(int nMode, const CFX_WideString& script, CFX_WideString& info); - - CJS_EventHandler* GetEventHandler() { return m_pEventHandler; } + CJS_Runtime* GetJSRuntime() const { return m_pRuntime; } + CJS_EventHandler* GetEventHandler() const { return m_pEventHandler; } CPDFSDK_Document* GetReaderDocument(); private: diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index 72f2a5de01..f9d8f50248 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -91,11 +91,6 @@ void JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Global<v8::Context>& v8PersistentContext); void JS_Initial(unsigned int embedderDataSlot); void JS_Release(); -int JS_Parse(IJS_Runtime* pJSRuntime, - IFXJS_Context* pJSContext, - const wchar_t* script, - long length, - FXJSErr* perror); int JS_Execute(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, |