Bug 1848771 part 2 - Remove unused INIT_JS_STANDARD_CLASSES flag. r=p…

…eterv Similar to part 1, but `INIT_JS_STANDARD_CLASSES` isn't used anymore so this shouldn't affect behavior. Differential Revision: https://phabricator.services.mozilla.com/D186217
dothq · Jan 23, 2024 · a61fca9 · a61fca9
1 parent 5656ba3
commit a61fca9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -154,7 +154,6 @@ static nsresult FinishCreate(JSContext* cx, XPCWrappedNativeScope* Scope,
 nsresult XPCWrappedNative::WrapNewGlobal(JSContext* cx,
                                          xpcObjectHelper& nativeHelper,
                                          nsIPrincipal* principal,
-                                         bool initStandardClasses,
                                          JS::RealmOptions& aOptions,
                                          XPCWrappedNative** wrappedGlobal) {
   nsCOMPtr<nsISupports> identity = do_QueryInterface(nativeHelper.Object());
@@ -194,11 +193,6 @@ nsresult XPCWrappedNative::WrapNewGlobal(JSContext* cx,
   // create ends up there.
   JSAutoRealm ar(cx, global);
 
-  // If requested, initialize the standard classes on the global.
-  if (initStandardClasses && !JS::InitRealmStandardClasses(cx)) {
-    return NS_ERROR_FAILURE;
-  }
-
   // Make a proto.
   XPCWrappedNativeProto* proto = XPCWrappedNativeProto::GetNewOrUsed(
       cx, scope, nativeHelper.GetClassInfo(), scrProto);

diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
@@ -567,8 +567,7 @@ nsresult InitClassesWithNewWrappedGlobal(JSContext* aJSContext,
   MOZ_ASSERT(helper.GetScriptableFlags() & XPC_SCRIPTABLE_IS_GLOBAL_OBJECT);
   RefPtr<XPCWrappedNative> wrappedGlobal;
   nsresult rv = XPCWrappedNative::WrapNewGlobal(
-      aJSContext, helper, aPrincipal, aFlags & xpc::INIT_JS_STANDARD_CLASSES,
-      aOptions, getter_AddRefs(wrappedGlobal));
+      aJSContext, helper, aPrincipal, aOptions, getter_AddRefs(wrappedGlobal));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Grab a copy of the global and enter its compartment.

diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
@@ -1428,7 +1428,6 @@ class XPCWrappedNative final : public nsIXPConnectWrappedNative {
 
   static nsresult WrapNewGlobal(JSContext* cx, xpcObjectHelper& nativeHelper,
                                 nsIPrincipal* principal,
-                                bool initStandardClasses,
                                 JS::RealmOptions& aOptions,
                                 XPCWrappedNative** wrappedGlobal);
 

diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
@@ -166,10 +166,9 @@ JSObject* XrayAwareCalleeGlobal(JSObject* fun);
 void TraceXPCGlobal(JSTracer* trc, JSObject* obj);
 
 /**
- * Creates a new global object using the given aCOMObj as the global
- * object. The object will be set up according to the flags (defined
- * below). If you do not pass INIT_JS_STANDARD_CLASSES, then aCOMObj
- * must implement nsIXPCScriptable so it can resolve the standard
+ * Creates a new global object using the given aCOMObj as the global object.
+ * The object will be set up according to the flags (defined below).
+ * aCOMObj must implement nsIXPCScriptable so it can resolve the standard
  * classes when asked by the JS engine.
  *
  * @param aJSContext the context to use while creating the global object.
@@ -186,9 +185,8 @@ nsresult InitClassesWithNewWrappedGlobal(
     JS::MutableHandle<JSObject*> aNewGlobal);
 
 enum InitClassesFlag {
-  INIT_JS_STANDARD_CLASSES = 1 << 0,
-  DONT_FIRE_ONNEWGLOBALHOOK = 1 << 1,
-  OMIT_COMPONENTS_OBJECT = 1 << 2,
+  DONT_FIRE_ONNEWGLOBALHOOK = 1 << 0,
+  OMIT_COMPONENTS_OBJECT = 1 << 1,
 };
 
 } /* namespace xpc */