Merge to XFA: Remove some abstractions in fxjs_v8.h.

Conflicts:
  fpdfsdk/src/javascript/Document.cpp
  fpdfsdk/src/javascript/JS_Runtime.cpp
  fpdfsdk/src/jsapi/fxjs_v8.cpp

New:
  fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp

(cherry picked from commit 6df59849472958e7de96da6d9fc7b223b7c1f1c3)
Original Review URL: https://codereview.chromium.org/1332973002 .

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1334833003 .

1 files changed, 13 insertions, 15 deletions

diff --git a/fpdfsdk/include/javascript/Consts.h b/fpdfsdk/include/javascript/Consts.h
index 79f85f8002..165001784b 100644
--- a/fpdfsdk/include/javascript/Consts.h
+++ b/fpdfsdk/include/javascript/Consts.h
@@ -13,7 +13,7 @@
 
 class CJS_Border : public CJS_Object {
  public:
-  explicit CJS_Border(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_Border(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Border() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -23,7 +23,7 @@ class CJS_Border : public CJS_Object {
 
 class CJS_Display : public CJS_Object {
  public:
-  explicit CJS_Display(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_Display(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Display() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -33,7 +33,7 @@ class CJS_Display : public CJS_Object {
 
 class CJS_Font : public CJS_Object {
  public:
-  explicit CJS_Font(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_Font(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Font() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -43,7 +43,7 @@ class CJS_Font : public CJS_Object {
 
 class CJS_Highlight : public CJS_Object {
  public:
-  explicit CJS_Highlight(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_Highlight(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Highlight() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -53,7 +53,7 @@ class CJS_Highlight : public CJS_Object {
 
 class CJS_Position : public CJS_Object {
  public:
-  explicit CJS_Position(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_Position(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Position() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -63,7 +63,7 @@ class CJS_Position : public CJS_Object {
 
 class CJS_ScaleHow : public CJS_Object {
  public:
-  explicit CJS_ScaleHow(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_ScaleHow(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_ScaleHow() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -73,7 +73,7 @@ class CJS_ScaleHow : public CJS_Object {
 
 class CJS_ScaleWhen : public CJS_Object {
  public:
-  explicit CJS_ScaleWhen(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_ScaleWhen(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_ScaleWhen() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -83,7 +83,7 @@ class CJS_ScaleWhen : public CJS_Object {
 
 class CJS_Style : public CJS_Object {
  public:
-  explicit CJS_Style(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_Style(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Style() override {}
 
   DECLARE_JS_CLASS_CONST();
@@ -93,26 +93,24 @@ class CJS_Style : public CJS_Object {
 
 class CJS_Zoomtype : public CJS_Object {
  public:
-  explicit CJS_Zoomtype(JSFXObject pObject) : CJS_Object(pObject) {}
+  explicit CJS_Zoomtype(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Zoomtype() override {}
 
   DECLARE_JS_CLASS_CONST();
 };
 
-/* ------------------------------ CJS_GlobalConsts
- * ------------------------------ */
+/* ------------------------------ CJS_GlobalConsts -------------------------- */
 
 class CJS_GlobalConsts : public CJS_Object {
  public:
-  static int Init(IJS_Runtime* pRuntime);
+  static int Init(v8::Isolate* pIsolate);
 };
 
-/* ------------------------------ CJS_GlobalArrays
- * ------------------------------ */
+/* ------------------------------ CJS_GlobalArrays -------------------------- */
 
 class CJS_GlobalArrays : public CJS_Object {
  public:
-  static int Init(IJS_Runtime* pRuntime);
+  static int Init(v8::Isolate* pIsolate);
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_