From ba038bc14bfeb4d011d57f388871f7f14c4c3c22 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 8 Oct 2015 12:03:00 -0700 Subject: Merge to XFA: Rename IFXJS_Runtime and IFXJS_Context to IJS_. Merge conflicts in: fpdfsdk/src/javascript/Document.cpp fpdfsdk/src/javascript/JS_Define.h New code in: fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp (cherry picked from commit 213a172779fddbd7e588ee2e2b3906ccc47d6896) Original Review URL: https://codereview.chromium.org/1386173002 . R=thestig@chromium.org Review URL: https://codereview.chromium.org/1395713002 . --- fpdfsdk/src/fsdk_mgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/src/fsdk_mgr.cpp') diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index c6395bfc83..4c684cfb69 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -376,11 +376,11 @@ void CPDFDoc_Environment::JS_docmailForm(void* mailData, } } -IFXJS_Runtime* CPDFDoc_Environment::GetJSRuntime() { +IJS_Runtime* CPDFDoc_Environment::GetJSRuntime() { if (!IsJSInitiated()) return NULL; if (!m_pJSRuntime) - m_pJSRuntime.reset(IFXJS_Runtime::Create(this)); + m_pJSRuntime.reset(IJS_Runtime::Create(this)); return m_pJSRuntime.get(); } @@ -626,7 +626,7 @@ FX_BOOL CPDFSDK_Document::GetPermissions(int nFlag) { return dwPermissions & nFlag; } -IFXJS_Runtime* CPDFSDK_Document::GetJsRuntime() { +IJS_Runtime* CPDFSDK_Document::GetJsRuntime() { ASSERT(m_pEnv != NULL); return m_pEnv->GetJSRuntime(); } -- cgit v1.2.3