[gjs/mozjs91: 3/15] Remove JSPROP_GETTER and JSPROP_SETTER usage




commit 597aea757c5a8b2d0b71981997395108573649ad
Author: Evan Welsh <contact evanwelsh com>
Date:   Sat Aug 7 14:33:20 2021 -0700

    Remove JSPROP_GETTER and JSPROP_SETTER usage
    
    These flags are now automatically determined based on whether the
    passed getter or setter is null.
    
    Changeset: https://phabricator.services.mozilla.com/D116091
    See: https://bugzilla.mozilla.org/show_bug.cgi?id=1713083

 gjs/jsapi-dynamic-class.cpp | 4 +---
 modules/system.cpp          | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gjs/jsapi-dynamic-class.cpp b/gjs/jsapi-dynamic-class.cpp
index cb206d22..038bd0db 100644
--- a/gjs/jsapi-dynamic-class.cpp
+++ b/gjs/jsapi-dynamic-class.cpp
@@ -12,7 +12,7 @@
 #include <js/CallArgs.h>  // for JSNative
 #include <js/Class.h>
 #include <js/ComparisonOperators.h>
-#include <js/PropertyDescriptor.h>  // for JSPROP_GETTER
+#include <js/PropertyDescriptor.h>
 #include <js/Realm.h>  // for GetRealmObjectPrototype
 #include <js/RootingAPI.h>
 #include <js/TypeDecls.h>
@@ -216,8 +216,6 @@ gjs_define_property_dynamic(JSContext       *cx,
     if (!setter_obj)
         return false;
 
-    flags |= JSPROP_GETTER | JSPROP_SETTER;
-
     return JS_DefineProperty(cx, proto, prop_name, getter_obj, setter_obj,
                              flags);
 }
diff --git a/modules/system.cpp b/modules/system.cpp
index 76e5dc66..99949ebf 100644
--- a/modules/system.cpp
+++ b/modules/system.cpp
@@ -347,7 +347,7 @@ gjs_js_define_system_stuff(JSContext              *context,
                                  GJS_MODULE_PROP_FLAGS | JSPROP_READONLY) &&
            JS_DefinePropertyById(context, module, gjs->atoms().program_args(),
                                  program_args_getter, nullptr,
-                                 GJS_MODULE_PROP_FLAGS | JSPROP_GETTER) &&
+                                 GJS_MODULE_PROP_FLAGS) &&
            JS_DefinePropertyById(context, module, gjs->atoms().version(),
                                  GJS_VERSION,
                                  GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]