From fb25606e584e14d60fc243e8b56eef399a4a54bd Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 1 Feb 2018 19:23:03 +0000 Subject: Make FXJSE_Engine constructed from FXJS_Engine. No change in functionality yet, just passing higher level object. Precursor to maybe sharing v8 context between fxjs / fxjse. Mark unimplemented ctors / assignment operator as "delete". Change-Id: I100de7755909eec2eed96f6f51216d85923ffbb2 Reviewed-on: https://pdfium-review.googlesource.com/25050 Commit-Queue: Tom Sepez Reviewed-by: dsinclair --- xfa/fxfa/parser/cxfa_document.cpp | 4 ++-- xfa/fxfa/parser/cxfa_document.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 0675e35358..434d6cbfde 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -286,9 +286,9 @@ CXFA_LocaleMgr* CXFA_Document::GetLocalMgr() { return m_pLocalMgr.get(); } -CFXJSE_Engine* CXFA_Document::InitScriptContext(v8::Isolate* pIsolate) { +CFXJSE_Engine* CXFA_Document::InitScriptContext(CFXJS_Engine* fxjs_engine) { ASSERT(!m_pScriptContext); - m_pScriptContext = pdfium::MakeUnique(this, pIsolate); + m_pScriptContext = pdfium::MakeUnique(this, fxjs_engine); return m_pScriptContext.get(); } diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h index bd576e68a5..f12148bee4 100644 --- a/xfa/fxfa/parser/cxfa_document.h +++ b/xfa/fxfa/parser/cxfa_document.h @@ -40,13 +40,14 @@ enum XFA_DocFlag { XFA_DOCFLAG_Scripting = 0x0008 }; -class CFX_XMLDoc; class CFXJSE_Engine; +class CFXJS_Engine; +class CFX_XMLDoc; class CScript_DataWindow; class CScript_EventPseudoModel; class CScript_HostPseudoModel; -class CScript_LogPseudoModel; class CScript_LayoutPseudoModel; +class CScript_LogPseudoModel; class CScript_SignaturePseudoModel; class CXFA_ContainerLayoutItem; class CXFA_DocumentParser; @@ -61,7 +62,7 @@ class CXFA_Document { explicit CXFA_Document(CXFA_DocumentParser* pParser); ~CXFA_Document(); - CFXJSE_Engine* InitScriptContext(v8::Isolate* pIsolate); + CFXJSE_Engine* InitScriptContext(CFXJS_Engine* fxjs_engine); CXFA_Node* GetRoot() const { return m_pRootNode; } -- cgit v1.2.3