From 808a99e8c6f72713ca9492508faa4b8445ae0d33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 10 Sep 2015 12:28:37 -0700 Subject: 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 . --- fpdfsdk/include/javascript/console.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fpdfsdk/include/javascript/console.h') diff --git a/fpdfsdk/include/javascript/console.h b/fpdfsdk/include/javascript/console.h index e001695ebf..1571d109f1 100644 --- a/fpdfsdk/include/javascript/console.h +++ b/fpdfsdk/include/javascript/console.h @@ -35,7 +35,7 @@ class console : public CJS_EmbedObj { class CJS_Console : public CJS_Object { public: - CJS_Console(JSFXObject pObject) : CJS_Object(pObject) {} + CJS_Console(v8::Local pObject) : CJS_Object(pObject) {} ~CJS_Console() override {} DECLARE_JS_CLASS(CJS_Console); -- cgit v1.2.3