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/src/javascript/JS_Context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/src/javascript/JS_Context.cpp') diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp index 51c18f1249..3c9be58013 100644 --- a/fpdfsdk/src/javascript/JS_Context.cpp +++ b/fpdfsdk/src/javascript/JS_Context.cpp @@ -56,8 +56,8 @@ FX_BOOL CJS_Context::RunScript(const CFX_WideString& script, FXJSErr error = {NULL, NULL, 0}; int nRet = 0; if (script.GetLength() > 0) { - nRet = JS_Execute(*m_pRuntime, this, script.c_str(), script.GetLength(), - &error); + nRet = JS_Execute(m_pRuntime->GetIsolate(), this, script.c_str(), + script.GetLength(), &error); } if (nRet < 0) { -- cgit v1.2.3