From 4c1ced59a6752f21fa857556a845ffad5919fbae Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 18 Oct 2018 21:58:21 +0000 Subject: One more round of IWYU in fxjs/. Also get rid of CFXJSE_FormCalcContext::m_pFMClass, which mostly goes unused. Change-Id: Idad72afaf5796e6174a5f23ad0460a8e0a93f9ab Reviewed-on: https://pdfium-review.googlesource.com/c/44273 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- fxjs/cfxjse_arguments.h | 5 ++++- fxjs/cfxjse_engine.cpp | 1 + fxjs/cfxjse_engine.h | 4 +++- fxjs/cfxjse_formcalc_context.cpp | 8 ++++---- fxjs/cfxjse_formcalc_context.h | 4 ++-- fxjs/cjs_timerobj.cpp | 1 + fxjs/global_timer.cpp | 2 ++ fxjs/global_timer.h | 5 ++++- fxjs/xfa/cjx_container.cpp | 1 + fxjs/xfa/cjx_content.h | 1 - fxjs/xfa/cjx_layoutpseudomodel.cpp | 1 + fxjs/xfa/cjx_list.cpp | 1 + fxjs/xfa/cjx_node.h | 1 - 13 files changed, 24 insertions(+), 11 deletions(-) diff --git a/fxjs/cfxjse_arguments.h b/fxjs/cfxjse_arguments.h index 05fb97411a..e923465091 100644 --- a/fxjs/cfxjse_arguments.h +++ b/fxjs/cfxjse_arguments.h @@ -9,8 +9,11 @@ #include +#include "core/fxcrt/fx_string.h" #include "core/fxcrt/unowned_ptr.h" -#include "fxjs/cfxjse_class.h" +#include "v8/include/v8.h" + +class CFXJSE_Value; class CFXJSE_Arguments { public: diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp index 92dc2d548f..70cacbb111 100644 --- a/fxjs/cfxjse_engine.cpp +++ b/fxjs/cfxjse_engine.cpp @@ -13,6 +13,7 @@ #include "core/fxcrt/fx_extension.h" #include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_context.h" +#include "fxjs/cfxjse_formcalc_context.h" #include "fxjs/cfxjse_resolveprocessor.h" #include "fxjs/cfxjse_value.h" #include "fxjs/cjs_runtime.h" diff --git a/fxjs/cfxjse_engine.h b/fxjs/cfxjse_engine.h index 183074d70a..7331701c88 100644 --- a/fxjs/cfxjse_engine.h +++ b/fxjs/cfxjse_engine.h @@ -13,13 +13,15 @@ #include "core/fxcrt/unowned_ptr.h" #include "fxjs/cfx_v8.h" -#include "fxjs/cfxjse_formcalc_context.h" #include "v8/include/v8.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_script.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" +class CFXJSE_Class; +class CFXJSE_Context; +class CFXJSE_FormCalcContext; class CFXJSE_ResolveProcessor; class CJS_Runtime; class CXFA_List; diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp index 771c53ab36..f95ee831a7 100644 --- a/fxjs/cfxjse_formcalc_context.cpp +++ b/fxjs/cfxjse_formcalc_context.cpp @@ -15,6 +15,7 @@ #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_random.h" #include "core/fxcrt/locale_iface.h" +#include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_context.h" #include "fxjs/cfxjse_engine.h" @@ -6180,12 +6181,11 @@ CFXJSE_FormCalcContext::CFXJSE_FormCalcContext(v8::Isolate* pScriptIsolate, CFXJSE_Context* pScriptContext, CXFA_Document* pDoc) : m_pIsolate(pScriptIsolate), - m_pFMClass(CFXJSE_Class::Create(pScriptContext, - &kFormCalcFM2JSDescriptor, - false)), m_pValue(pdfium::MakeUnique(pScriptIsolate)), m_pDocument(pDoc) { - m_pValue.get()->SetObject(this, m_pFMClass); + m_pValue->SetObject( + this, + CFXJSE_Class::Create(pScriptContext, &kFormCalcFM2JSDescriptor, false)); } CFXJSE_FormCalcContext::~CFXJSE_FormCalcContext() = default; diff --git a/fxjs/cfxjse_formcalc_context.h b/fxjs/cfxjse_formcalc_context.h index b1023308f3..68add34414 100644 --- a/fxjs/cfxjse_formcalc_context.h +++ b/fxjs/cfxjse_formcalc_context.h @@ -11,9 +11,10 @@ #include #include "core/fxcrt/unowned_ptr.h" -#include "fxjs/cfxjse_arguments.h" +#include "fxjs/fxjse.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" +class CFXJSE_Arguments; class CFXJSE_Context; class CFX_WideTextBuf; class CXFA_Document; @@ -402,7 +403,6 @@ class CFXJSE_FormCalcContext final : public CFXJSE_HostObject { void ThrowException(const WideString& str) const; UnownedPtr m_pIsolate; - CFXJSE_Class* m_pFMClass; std::unique_ptr m_pValue; UnownedPtr const m_pDocument; }; diff --git a/fxjs/cjs_timerobj.cpp b/fxjs/cjs_timerobj.cpp index f11d3fda8f..5fa1ac3329 100644 --- a/fxjs/cjs_timerobj.cpp +++ b/fxjs/cjs_timerobj.cpp @@ -7,6 +7,7 @@ #include "fxjs/cjs_timerobj.h" #include "fxjs/global_timer.h" +#include "fxjs/js_define.h" int CJS_TimerObj::ObjDefnID = -1; diff --git a/fxjs/global_timer.cpp b/fxjs/global_timer.cpp index 9c69ac2ea9..80278208ad 100644 --- a/fxjs/global_timer.cpp +++ b/fxjs/global_timer.cpp @@ -6,6 +6,8 @@ #include "fxjs/global_timer.h" +#include "fxjs/cjs_app.h" + GlobalTimer::GlobalTimer(CJS_App* pObj, CPDFSDK_FormFillEnvironment* pFormFillEnv, CJS_Runtime* pRuntime, diff --git a/fxjs/global_timer.h b/fxjs/global_timer.h index 63bda57be4..83081f656c 100644 --- a/fxjs/global_timer.h +++ b/fxjs/global_timer.h @@ -9,7 +9,10 @@ #include -#include "fxjs/cjs_app.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" +#include "fxjs/cjs_runtime.h" + +class CJS_App; class GlobalTimer { public: diff --git a/fxjs/xfa/cjx_container.cpp b/fxjs/xfa/cjx_container.cpp index 6b0d488a4f..2a70bd611a 100644 --- a/fxjs/xfa/cjx_container.cpp +++ b/fxjs/xfa/cjx_container.cpp @@ -8,6 +8,7 @@ #include +#include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" #include "xfa/fxfa/parser/cxfa_arraynodelist.h" diff --git a/fxjs/xfa/cjx_content.h b/fxjs/xfa/cjx_content.h index 5976b099b4..0e5a4f9b93 100644 --- a/fxjs/xfa/cjx_content.h +++ b/fxjs/xfa/cjx_content.h @@ -7,7 +7,6 @@ #ifndef FXJS_XFA_CJX_CONTENT_H_ #define FXJS_XFA_CJX_CONTENT_H_ -#include "fxjs/jse_define.h" #include "fxjs/xfa/cjx_object.h" class CXFA_Content; diff --git a/fxjs/xfa/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp index 1f3fe1274d..ea3590b52a 100644 --- a/fxjs/xfa/cjx_layoutpseudomodel.cpp +++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp @@ -10,6 +10,7 @@ #include #include "core/fxcrt/fx_coordinates.h" +#include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" #include "fxjs/js_resources.h" diff --git a/fxjs/xfa/cjx_list.cpp b/fxjs/xfa/cjx_list.cpp index e86e1fa7c5..6b4aa99633 100644 --- a/fxjs/xfa/cjx_list.cpp +++ b/fxjs/xfa/cjx_list.cpp @@ -8,6 +8,7 @@ #include +#include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" #include "fxjs/js_resources.h" diff --git a/fxjs/xfa/cjx_node.h b/fxjs/xfa/cjx_node.h index af6800b5e5..b73b4fb931 100644 --- a/fxjs/xfa/cjx_node.h +++ b/fxjs/xfa/cjx_node.h @@ -8,7 +8,6 @@ #define FXJS_XFA_CJX_NODE_H_ #include "fxjs/jse_define.h" -#include "fxjs/xfa/cjx_object.h" #include "fxjs/xfa/cjx_tree.h" #include "xfa/fxfa/fxfa_basic.h" -- cgit v1.2.3