From 3342090d65e852f3f37a8f04d3fbe3ff2467d05c Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 13 Oct 2015 15:00:10 -0700 Subject: Merge to XFA: Pass IJS_Runtime, not IJS_Context, to native object constructors. Original Review URL: https://codereview.chromium.org/1389163007 . (cherry picked from commit 848a13b6777cbff8cc4aea3ab3d69eaa0b82ae6c) Merge conflics in: fpdfsdk/src/javascript/JS_Runtime.cpp fpdfsdk/src/javascript/JS_Runtime_Stub.cpp fpdfsdk/src/jsapi/fxjs_v8.cpp R=thestig@chromium.org Review URL: https://codereview.chromium.org/1394993006 . --- fpdfsdk/src/javascript/JS_Object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/src/javascript/JS_Object.h') diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h index 563a316bd6..50751523f5 100644 --- a/fpdfsdk/src/javascript/JS_Object.h +++ b/fpdfsdk/src/javascript/JS_Object.h @@ -49,8 +49,8 @@ class CJS_Object { virtual FX_BOOL IsType(const FX_CHAR* sClassName) { return TRUE; } virtual CFX_ByteString GetClassName() { return ""; } - virtual FX_BOOL InitInstance(IJS_Context* cc) { return TRUE; } - virtual FX_BOOL ExitInstance() { return TRUE; } + virtual void InitInstance(IJS_Runtime* pIRuntime) {} + virtual void ExitInstance() {} v8::Local ToV8Object() { return m_pV8Object.Get(m_pIsolate); } -- cgit v1.2.3