From 998fee395fc8a543968c7db3db9e3cf81dee57fc Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Mon, 5 Feb 2018 21:43:19 +0000
Subject: Remove the CJS_EmbedObj template param from JSConstructor.

Each of the CJS_Objects can create their CJS_EmbedObj's internally and
we don't need to do it though the JSConstructor. This also removes the
need for the SetEmbedObj method in CJS_Object.

Change-Id: Ib0535ad922b370634fd1e622a04860a96c4f2825
Reviewed-on: https://pdfium-review.googlesource.com/25370
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 fxjs/cjs_util.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'fxjs/cjs_util.cpp')

diff --git a/fxjs/cjs_util.cpp b/fxjs/cjs_util.cpp
index b161ec73fd..db03dbdb82 100644
--- a/fxjs/cjs_util.cpp
+++ b/fxjs/cjs_util.cpp
@@ -69,13 +69,17 @@ int CJS_Util::ObjDefnID = -1;
 // static
 void CJS_Util::DefineJSObjects(CFXJS_Engine* pEngine) {
   ObjDefnID = pEngine->DefineObj("util", FXJSOBJTYPE_STATIC,
-                                 JSConstructor<CJS_Util, util>, JSDestructor);
+                                 JSConstructor<CJS_Util>, JSDestructor);
   DefineMethods(pEngine, ObjDefnID, MethodSpecs, FX_ArraySize(MethodSpecs));
 }
 
+CJS_Util::CJS_Util(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {
+  m_pEmbedObj = pdfium::MakeUnique<util>(this);
+}
+
 util::util(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {}
 
-util::~util() {}
+util::~util() = default;
 
 CJS_Return util::printf(CJS_Runtime* pRuntime,
                         const std::vector<v8::Local<v8::Value>>& params) {
-- 
cgit v1.2.3