From f743552fbdb17f974c9b1675af81210fe0ffcc50 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 5 Feb 2018 22:27:22 +0000 Subject: Fold CJS_EmbedObj classes into CJS_Object classes This CL removes the CJS_EmbedObj class and various subclasses and folds the subclasses into their CJS_Object counterparts. Change-Id: If6b882a4995c0b1bf83ac783f5c27ba9216c2d5c Reviewed-on: https://pdfium-review.googlesource.com/25410 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fxjs/cjs_icon.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'fxjs/cjs_icon.cpp') diff --git a/fxjs/cjs_icon.cpp b/fxjs/cjs_icon.cpp index 69a6d45557..40a2936d95 100644 --- a/fxjs/cjs_icon.cpp +++ b/fxjs/cjs_icon.cpp @@ -10,6 +10,7 @@ const JSPropertySpec CJS_Icon::PropertySpecs[] = { {"name", get_name_static, set_name_static}}; int CJS_Icon::ObjDefnID = -1; +const char CJS_Icon::kName[] = "Icon"; // static int CJS_Icon::GetObjDefnID() { @@ -18,24 +19,20 @@ int CJS_Icon::GetObjDefnID() { // static void CJS_Icon::DefineJSObjects(CFXJS_Engine* pEngine) { - ObjDefnID = pEngine->DefineObj("Icon", FXJSOBJTYPE_DYNAMIC, + ObjDefnID = pEngine->DefineObj(CJS_Icon::kName, FXJSOBJTYPE_DYNAMIC, JSConstructor, JSDestructor); DefineProps(pEngine, ObjDefnID, PropertySpecs, FX_ArraySize(PropertySpecs)); } -CJS_Icon::CJS_Icon(v8::Local pObject) : CJS_Object(pObject) { - m_pEmbedObj = pdfium::MakeUnique(this); -} - -Icon::Icon(CJS_Object* pJSObject) - : CJS_EmbedObj(pJSObject), m_swIconName(L"") {} +CJS_Icon::CJS_Icon(v8::Local pObject) + : CJS_Object(pObject), m_swIconName(L"") {} -Icon::~Icon() = default; +CJS_Icon::~CJS_Icon() = default; -CJS_Return Icon::get_name(CJS_Runtime* pRuntime) { +CJS_Return CJS_Icon::get_name(CJS_Runtime* pRuntime) { return CJS_Return(pRuntime->NewString(m_swIconName.c_str())); } -CJS_Return Icon::set_name(CJS_Runtime* pRuntime, v8::Local vp) { +CJS_Return CJS_Icon::set_name(CJS_Runtime* pRuntime, v8::Local vp) { return CJS_Return(false); } -- cgit v1.2.3