From cd56a7d6fb05bd0babf316a84280a26ecc649d45 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 6 Oct 2015 11:45:28 -0700 Subject: Merge to XFA: Store object definition ID in each js_class. Manual edits in JS_Define.h. (cherry picked from commit f0a5b2803c09f3605dcd606e764ef604f0d2a8ea) Original Review URL: https://codereview.chromium.org/1382263002 . R=thestig@chromium.org Review URL: https://codereview.chromium.org/1382683008 . --- fpdfsdk/include/jsapi/fxjs_v8.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/include/jsapi') diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index ed652942af..f51340acd3 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -23,8 +23,9 @@ class IFXJS_Runtime; class CFXJSE_RuntimeData; enum FXJSOBJTYPE { - FXJS_DYNAMIC = 0, - FXJS_STATIC = 1, + FXJSOBJTYPE_DYNAMIC = 0, // Created by native method and returned to JS. + FXJSOBJTYPE_STATIC, // Created by init and hung off of global object. + FXJSOBJTYPE_GLOBAL, // The global object itself (may only appear once). }; struct FXJSErr { @@ -132,7 +133,6 @@ v8::Local FXJS_NewFxDynamicObj(v8::Isolate* pIsolate, int nObjDefnID); v8::Local FXJS_GetThisObj(v8::Isolate* pIsolate); int FXJS_GetObjDefnID(v8::Local pObj); -int FXJS_GetObjDefnID(v8::Isolate* pIsolate, const wchar_t* pObjName); v8::Isolate* FXJS_GetRuntime(v8::Local pObj); const wchar_t* FXJS_GetTypeof(v8::Local pObj); -- cgit v1.2.3