commit 82999fa9d685638561efc6df2c8370c7e7f47676
author Tom Sepez <tsepez@chromium.org> Mon Jul 16 22:17:46 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Jul 16 22:17:46 2018 +0000
tree decf3cacc87bb0a0c7481d10ce7a2b1c11729a56
parent f9d49da715deeb0efa6eaaf8ac43727ae28f8749

Make JSGetObject<C>() return UnownedPtr<C>.

This a convenient place to assert that the callback that is about
to be invoked on the object doesn't destroy the object at any point
during its execution.

Change-Id: Iacb9d4e01603cc6bf316b00fdd062955c903ca5c
Reviewed-on: https://pdfium-review.googlesource.com/37970
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

fxjs/js_define.h

diff --git a/fxjs/js_define.h b/fxjs/js_define.h
index 629cf1a..ae1557e 100644
--- a/fxjs/js_define.h
+++ b/fxjs/js_define.h
@@ -10,6 +10,7 @@
 #include <utility>
 #include <vector>
 
+#include "core/fxcrt/unowned_ptr.h"
 #include "fxjs/cfxjs_engine.h"
 #include "fxjs/cjs_object.h"
 #include "fxjs/cjs_return.h"
@@ -58,7 +59,7 @@
 void JSDestructor(v8::Local<v8::Object> obj);
 
 template <class C>
-C* JSGetObject(v8::Local<v8::Object> obj) {
+UnownedPtr<C> JSGetObject(v8::Local<v8::Object> obj) {
   if (CFXJS_Engine::GetObjDefnID(obj) != C::GetObjDefnID())
     return nullptr;
 
@@ -66,7 +67,7 @@
   if (!pJSObj)
     return nullptr;
 
-  return static_cast<C*>(pJSObj);
+  return UnownedPtr<C>(static_cast<C*>(pJSObj));
 }
 
 template <class C, CJS_Return (C::*M)(CJS_Runtime*)>
@@ -74,7 +75,7 @@
                   const char* class_name_string,
                   v8::Local<v8::String> property,
                   const v8::PropertyCallbackInfo<v8::Value>& info) {
-  C* pObj = JSGetObject<C>(info.Holder());
+  auto pObj = JSGetObject<C>(info.Holder());
   if (!pObj)
     return;
 
@@ -82,7 +83,7 @@
   if (!pRuntime)
     return;
 
-  CJS_Return result = (pObj->*M)(pRuntime);
+  CJS_Return result = (pObj.Get()->*M)(pRuntime);
   if (result.HasError()) {
     pRuntime->Error(JSFormatErrorString(class_name_string, prop_name_string,
                                         result.Error()));
@@ -99,7 +100,7 @@
                   v8::Local<v8::String> property,
                   v8::Local<v8::Value> value,
                   const v8::PropertyCallbackInfo<void>& info) {
-  C* pObj = JSGetObject<C>(info.Holder());
+  auto pObj = JSGetObject<C>(info.Holder());
   if (!pObj)
     return;
 
@@ -107,7 +108,7 @@
   if (!pRuntime)
     return;
 
-  CJS_Return result = (pObj->*M)(pRuntime, value);
+  CJS_Return result = (pObj.Get()->*M)(pRuntime, value);
   if (result.HasError()) {
     pRuntime->Error(JSFormatErrorString(class_name_string, prop_name_string,
                                         result.Error()));
@@ -120,7 +121,7 @@
 void JSMethod(const char* method_name_string,
               const char* class_name_string,
               const v8::FunctionCallbackInfo<v8::Value>& info) {
-  C* pObj = JSGetObject<C>(info.Holder());
+  auto pObj = JSGetObject<C>(info.Holder());
   if (!pObj)
     return;
 
@@ -132,7 +133,7 @@
   for (unsigned int i = 0; i < (unsigned int)info.Length(); i++)
     parameters.push_back(info[i]);
 
-  CJS_Return result = (pObj->*M)(pRuntime, parameters);
+  CJS_Return result = (pObj.Get()->*M)(pRuntime, parameters);
   if (result.HasError()) {
     pRuntime->Error(JSFormatErrorString(class_name_string, method_name_string,
                                         result.Error()));