[gjs/wip/ptomato/mozjs38: 16/17] WIP - Adapt to new JS::Heap API

[Philip Chimento <pchimento src gnome org>]

commit ad63fe182500d3c8db879b59f274be22ff73b913
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Jan 11 23:41:44 2017 -0800

    WIP - Adapt to new JS::Heap API
    
    This can be cherry picked to master??

 gi/fundamental.cpp |    2 +-
 gjs/context.cpp    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gi/fundamental.cpp b/gi/fundamental.cpp
index 77819dd..6e2d3ac 100644
--- a/gi/fundamental.cpp
+++ b/gi/fundamental.cpp
@@ -380,7 +380,7 @@ fundamental_invoke_constructor(FundamentalInstance        *priv,
 
     if (!gjs_object_require_property_value(context, obj, NULL,
                                            constructor_const, &js_constructor) ||
-        priv->prototype->constructor_name == JSID_VOID) {
+        priv->prototype->constructor_name.get() == JSID_VOID) {
         gjs_throw (context,
                    "Couldn't find a constructor for type %s.%s",
                    g_base_info_get_namespace((GIBaseInfo*) priv->prototype->info),
diff --git a/gjs/context.cpp b/gjs/context.cpp
index 195c82f..efcdbac 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -494,7 +494,7 @@ gjs_context_constructed(GObject *object)
     if (!JS_DefineFunctions(js_context->context, global, &global_funcs[0]))
         g_error("Failed to define properties on the global object");
 
-    js_context->global.set(global);
+    js_context->global = global;
     JS_AddExtraGCRootsTracer(js_context->runtime, gjs_context_tracer, js_context);
 
     gjs_define_constructor_proxy_factory(js_context->context);