From 270fc65d5824eeedbb2ed17516a72721bde9c9ef Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 21 Sep 2015 09:01:56 -0700 Subject: More tidy of CJS_Object, kill implicit cast operator R=thestig@chromium.org Review URL: https://codereview.chromium.org/1349423006 . --- fpdfsdk/src/javascript/JS_Object.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'fpdfsdk/src/javascript/JS_Object.cpp') diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 6891e6fc60..3cffec785d 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -83,22 +83,21 @@ void DisposeObject(const v8::WeakCallbackInfo& data) { data.SetSecondPassCallback(FreeObject); } -CJS_Object::CJS_Object(v8::Local pObject) : m_pEmbedObj(NULL) { - v8::Local context = pObject->CreationContext(); - m_pIsolate = context->GetIsolate(); - m_pObject.Reset(m_pIsolate, pObject); -}; +CJS_Object::CJS_Object(v8::Local pObject) { + m_pIsolate = pObject->CreationContext()->GetIsolate(); + m_pV8Object.Reset(m_pIsolate, pObject); +} CJS_Object::~CJS_Object() { - m_pObject.Reset(); -}; +} void CJS_Object::MakeWeak() { - m_pObject.SetWeak(this, DisposeObject, v8::WeakCallbackType::kInternalFields); + m_pV8Object.SetWeak(this, DisposeObject, + v8::WeakCallbackType::kInternalFields); } void CJS_Object::Dispose() { - m_pObject.Reset(); + m_pV8Object.Reset(); } CPDFSDK_PageView* CJS_Object::JSGetPageView(IFXJS_Context* cc) { -- cgit v1.2.3