Enable setting arbitrary parameters as memory owner

implausible · implausible · commit 6419fafa27d1 · 2018-10-12T16:59:43.000-07:00
diff --git a/generate/templates/filters/fields_info.js b/generate/templates/filters/fields_info.js
@@ -9,6 +9,7 @@ module.exports = function(fields) {
     fieldInfo.parsedName = field.name || "result";
     fieldInfo.isCppClassIntType = ~["Uint32", "Int32"].indexOf(field.cppClassName);
     fieldInfo.parsedClassName = (field.cppClassName || '').toLowerCase() + "_t";
+    fieldInfo.hasOwner = !!fieldInfo.ownedByThis;
 
     result.push(fieldInfo);
   });
diff --git a/generate/templates/filters/returns_info.js b/generate/templates/filters/returns_info.js
@@ -34,7 +34,7 @@ module.exports = function(fn, argReturnsOnly, isAsync) {
     return_info.returnNameOrName = return_info.returnName || return_info.name;
     return_info.jsOrCppClassName = return_info.jsClassName || return_info.cppClassName;
     return_info.isOutParam = true;
-    return_info.hasOwner = return_info.ownedBy || return_info.ownedByThis;
+    return_info.hasOwner = !!(return_info.ownedBy || return_info.ownedByThis);
     return_info.ownedByIndex = -1;
 
     // Here we convert ownedBy, which is the name of the parameter
@@ -57,6 +57,8 @@ module.exports = function(fn, argReturnsOnly, isAsync) {
     return_info.__proto__ = fn.return;
 
     return_info.isAsync = isAsync;
+    return_info.hasOwner = !!return_info.ownedByThis;
+    return_info.ownedByIndex = -1;
     return_info.parsedName = return_info.name && isAsync ? "baton->" + return_info.name : "result";
     return_info.isCppClassIntType = ~['Uint32', 'Int32'].indexOf(return_info.cppClassName);
     return_info.parsedClassName = (return_info.cppClassName || '').toLowerCase() + "_t";
diff --git a/generate/templates/partials/convert_to_v8.cc b/generate/templates/partials/convert_to_v8.cc
@@ -65,7 +65,20 @@
     {% if cppClassName == 'Wrapper' %}
       to = {{ cppClassName }}::New({{= parsedName =}});
     {% else %}
-      to = {{ cppClassName }}::New({{= parsedName =}}, {{ selfFreeing|toBool }} {% if ownedByThis %}, info.This(){% endif %});
+      to = {{ cppClassName }}::New(
+        {{= parsedName =}},
+        {{ selfFreeing|toBool }}
+        {% if hasOwner %}
+          ,
+          {% if ownedByThis %}
+            info.This()
+          {% elsif isAsync %}
+            this->GetFromPersistent("{{= ownedBy =}}")
+          {% else %}
+            info[{{= ownedByIndex =}}]->ToObject()
+          {% endif %}
+        {% endif %}
+      );
     {% endif %}
   }
   else {
