From 33d13f2231a07e7b32ff25da6a6a28cb619d18a9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 23 Oct 2017 09:44:30 -0400 Subject: Remove CJS_PropValue This CL removes the CJS_PropValue class and uses CJS_Value directly. The various Set methods have been moved to CJS_Value and the runtime provided as needed. Change-Id: Ib5d3b9efc9b6cf8182be8f19af98599379c3d7db Reviewed-on: https://pdfium-review.googlesource.com/16431 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/javascript/event.h | 102 ++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 62 deletions(-) (limited to 'fpdfsdk/javascript/event.h') diff --git a/fpdfsdk/javascript/event.h b/fpdfsdk/javascript/event.h index e67aa2b8af..f622443f3a 100644 --- a/fpdfsdk/javascript/event.h +++ b/fpdfsdk/javascript/event.h @@ -15,128 +15,106 @@ class event : public CJS_EmbedObj { ~event() override; public: - bool get_change(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); + bool get_change(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_change(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_change_ex(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_change_ex(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_change_ex(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_commit_key(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_commit_key(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_commit_key(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_field_full(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_field_full(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_field_full(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_key_down(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_key_down(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_key_down(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_modifier(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_modifier(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_modifier(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_name(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); - bool set_name(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, - WideString* sError); + bool get_name(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); + bool set_name(CJS_Runtime* pRuntime, const CJS_Value& vp, WideString* sError); - bool get_rc(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); - bool set_rc(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, - WideString* sError); + bool get_rc(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); + bool set_rc(CJS_Runtime* pRuntime, const CJS_Value& vp, WideString* sError); bool get_rich_change(CJS_Runtime* pRuntime, - CJS_PropValue* vp, + CJS_Value* vp, WideString* sError); bool set_rich_change(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); bool get_rich_change_ex(CJS_Runtime* pRuntime, - CJS_PropValue* vp, + CJS_Value* vp, WideString* sError); bool set_rich_change_ex(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_rich_value(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_rich_value(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_rich_value(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_sel_end(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_sel_end(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_sel_end(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_sel_start(CJS_Runtime* pRuntime, - CJS_PropValue* vp, - WideString* sError); + bool get_sel_start(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_sel_start(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_shift(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); + bool get_shift(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_shift(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_source(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); + bool get_source(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_source(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_target(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); + bool get_target(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_target(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); bool get_target_name(CJS_Runtime* pRuntime, - CJS_PropValue* vp, + CJS_Value* vp, WideString* sError); bool set_target_name(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); - bool get_type(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); - bool set_type(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, - WideString* sError); + bool get_type(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); + bool set_type(CJS_Runtime* pRuntime, const CJS_Value& vp, WideString* sError); - bool get_value(CJS_Runtime* pRuntime, CJS_PropValue* vp, WideString* sError); + bool get_value(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError); bool set_value(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); bool get_will_commit(CJS_Runtime* pRuntime, - CJS_PropValue* vp, + CJS_Value* vp, WideString* sError); bool set_will_commit(CJS_Runtime* pRuntime, - const CJS_PropValue& vp, + const CJS_Value& vp, WideString* sError); }; -- cgit v1.2.3