3 files changed, 28 insertions, 16 deletions

diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index d85fc6f109..65dae74ab4 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -153,7 +153,7 @@ class IFXJS_Runtime {
 
 class CJS_RuntimeFactory {
  public:
-  CJS_RuntimeFactory() : m_bInit(FALSE), m_nRef(0) {}
+  CJS_RuntimeFactory() : m_bInit(false), m_nRef(0) {}
   ~CJS_RuntimeFactory();
 
   IFXJS_Runtime* NewJSRuntime(CPDFDoc_Environment* pApp);
@@ -162,7 +162,7 @@ class CJS_RuntimeFactory {
   void Release();
 
  private:
-  FX_BOOL m_bInit;
+  bool m_bInit;
   int m_nRef;
 };
 
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index ac1a688369..f0285b271c 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -15,12 +15,6 @@
 
 class CJS_Context;
 
-class CJS_ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
-  void* Allocate(size_t length) override;
-  void* AllocateUninitialized(size_t length) override;
-  void Free(void* data, size_t length) override;
-};
-
 class CJS_FieldEvent {
  public:
   CFX_WideString sTargetName;
@@ -30,7 +24,7 @@ class CJS_FieldEvent {
 
 class CJS_Runtime : public IFXJS_Runtime {
  public:
-  CJS_Runtime(CPDFDoc_Environment* pApp);
+  explicit CJS_Runtime(CPDFDoc_Environment* pApp);
   ~CJS_Runtime() override;
 
   // IFXJS_Runtime
@@ -70,7 +64,7 @@ class CJS_Runtime : public IFXJS_Runtime {
   CJS_FieldEvent* m_pFieldEventPath;
   v8::Isolate* m_isolate;
   bool m_isolateManaged;
-  nonstd::unique_ptr<CJS_ArrayBufferAllocator> m_pArrayBufferAllocator;
+  nonstd::unique_ptr<JS_ArrayBufferAllocator> m_pArrayBufferAllocator;
   v8::Global<v8::Context> m_context;
 };
 
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index 4195686731..6e4fc6f7a7 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -45,14 +45,30 @@ extern const wchar_t kFXJSValueNameFxobj[];
 extern const wchar_t kFXJSValueNameNull[];
 extern const wchar_t kFXJSValueNameUndefined[];
 
+// FXJS_V8 places no interpretation on these two classes; it merely
+// passes them on to the caller-provided LP_CONSTRUCTORs.
 class IFXJS_Context;
 class IFXJS_Runtime;
 
+class JS_ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
+  void* Allocate(size_t length) override;
+  void* AllocateUninitialized(size_t length) override;
+  void Free(void* data, size_t length) override;
+};
+
 typedef void (*LP_CONSTRUCTOR)(IFXJS_Context* cc,
                                v8::Local<v8::Object> obj,
                                v8::Local<v8::Object> global);
 typedef void (*LP_DESTRUCTOR)(v8::Local<v8::Object> obj);
 
+// Call before making JS_PrepareIsolate call.
+void JS_Initialize(unsigned int embedderDataSlot);
+void JS_Release();
+
+// Call before making JS_Define* calls. Resources allocated here are cleared
+// as part of JS_ReleaseRuntime().
+void JS_PrepareIsolate(v8::Isolate* pIsolate);
+
 // Always returns a valid, newly-created objDefnID.
 int JS_DefineObj(v8::Isolate* pIsolate,
                  const wchar_t* sObjName,
@@ -86,19 +102,21 @@ void JS_DefineGlobalConst(v8::Isolate* pIsolate,
                           const wchar_t* sConstName,
                           v8::Local<v8::Value> pDefault);
 
-void JS_InitialRuntime(v8::Isolate* pIsolate,
-                       IFXJS_Runtime* pFXRuntime,
-                       IFXJS_Context* context,
-                       v8::Global<v8::Context>& v8PersistentContext);
+// Called after JS_Define* calls made.
+void JS_InitializeRuntime(v8::Isolate* pIsolate,
+                          IFXJS_Runtime* pFXRuntime,
+                          IFXJS_Context* context,
+                          v8::Global<v8::Context>& v8PersistentContext);
 void JS_ReleaseRuntime(v8::Isolate* pIsolate,
                        v8::Global<v8::Context>& v8PersistentContext);
-void JS_Initial(unsigned int embedderDataSlot);
-void JS_Release();
+
+// Called after JS_InitializeRuntime call made.
 int JS_Execute(v8::Isolate* pIsolate,
                IFXJS_Context* pJSContext,
                const wchar_t* script,
                long length,
                FXJSErr* perror);
+
 v8::Local<v8::Object> JS_NewFxDynamicObj(v8::Isolate* pIsolate,
                                          IFXJS_Context* pJSContext,
                                          int nObjDefnID);