scope handling fix (wip)

rbri · rbri · commit c0ff127d3a9c · 2026-04-24T11:11:44.000+02:00
diff --git a/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java b/src/main/java/org/htmlunit/javascript/JavaScriptEngine.java
@@ -1345,7 +1345,7 @@ public static Scriptable newObject(final VarScope scope) {
      *     dynamically).
      * @return the new array object
      */
-    public static Scriptable newArray(final Scriptable scope, final int length) {
+    public static Scriptable newArray(final VarScope scope, final int length) {
         final NativeArray result = new NativeArray(length);
         ScriptRuntime.setBuiltinProtoAndParent(result, scope, TopLevel.Builtins.Array);
         return result;
@@ -1398,7 +1398,7 @@ public static Scriptable newArrayIteratorTypeEntries(final VarScope scope, final
      *     JavaScript type and type of array should be exactly Object[], not SomeObjectSubclass[].
      * @return the new array object
      */
-    public static Scriptable newArray(final Scriptable scope, final Object[] elements) {
+    public static Scriptable newArray(final VarScope scope, final Object[] elements) {
         if (elements.getClass().getComponentType() != ScriptRuntime.ObjectClass) {
             throw new IllegalArgumentException();
         }
diff --git a/src/main/java/org/htmlunit/javascript/host/BroadcastChannel.java b/src/main/java/org/htmlunit/javascript/host/BroadcastChannel.java
@@ -22,6 +22,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.FunctionObject;
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.TopLevel;
 import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.javascript.AbstractJavaScriptEngine;
 import org.htmlunit.javascript.HtmlUnitContextFactory;
@@ -152,11 +153,12 @@ public void postMessage(final Object message) {
                     final Page channelPage = channelWebWindow.getEnclosedPage();
 
                     if (UrlUtils.isSameOrigin(currentURL, channelPage.getUrl())) {
-                        final Scriptable ports = JavaScriptEngine.newArray(w, 0);
+                        final TopLevel scope = channelWebWindow.getTopLevelScope();
+                        final Scriptable ports = JavaScriptEngine.newArray(scope, 0);
 
                         final MessageEvent event = new MessageEvent();
                         event.initMessageEvent(Event.TYPE_MESSAGE, false, false, message, origin, "", null, ports);
-                        event.setParentScope(channelWebWindow.getTopLevelScope());
+                        event.setParentScope(scope);
                         event.setPrototype(channelWindow.getPrototype(event.getClass()));
 
                         final PostponedAction action =
diff --git a/src/main/java/org/htmlunit/javascript/host/Element.java b/src/main/java/org/htmlunit/javascript/host/Element.java
@@ -686,15 +686,15 @@ public Scriptable getAttributeNames() {
         final org.w3c.dom.NamedNodeMap attributes = getDomNodeOrDie().getAttributes();
 
         if (attributes.getLength() == 0) {
-            return JavaScriptEngine.newArray(this, 0);
+            return JavaScriptEngine.newArray(getParentScope(), 0);
         }
 
         final ArrayList<String> res = new ArrayList<>();
         for (int i = 0; i < attributes.getLength(); i++) {
             res.add(attributes.item(i).getNodeName());
         }
 
-        return JavaScriptEngine.newArray(this, res.toArray());
+        return JavaScriptEngine.newArray(getParentScope(), res.toArray());
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/javascript/host/Navigator.java b/src/main/java/org/htmlunit/javascript/host/Navigator.java
@@ -107,7 +107,7 @@ public String getLanguage() {
     public Scriptable getLanguages() {
         final String acceptLang = getBrowserVersion().getAcceptLanguageHeader();
         if (StringUtils.isEmptyOrNull(acceptLang)) {
-            return JavaScriptEngine.newArray(this, 0);
+            return JavaScriptEngine.newArray(getParentScope(), 0);
         }
 
         final ArrayList<String> res = new ArrayList<>();
@@ -121,7 +121,7 @@ public Scriptable getLanguages() {
             }
         }
 
-        return JavaScriptEngine.newArray(this, res.toArray());
+        return JavaScriptEngine.newArray(getParentScope(), res.toArray());
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/javascript/host/URLSearchParams.java b/src/main/java/org/htmlunit/javascript/host/URLSearchParams.java
@@ -365,7 +365,7 @@ public Scriptable getAll(final String name) {
             }
         }
 
-        return JavaScriptEngine.newArray(getWindow(this), result.toArray());
+        return JavaScriptEngine.newArray(getParentScope(), result.toArray());
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/javascript/host/crypto/CryptoKey.java b/src/main/java/org/htmlunit/javascript/host/crypto/CryptoKey.java
@@ -134,7 +134,7 @@ public Scriptable getAlgorithm() {
      */
     @JsxGetter
     public Scriptable getUsages() {
-        return JavaScriptEngine.newArray(this, usages_.toArray());
+        return JavaScriptEngine.newArray(getParentScope(), usages_.toArray());
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/javascript/host/performance/Performance.java b/src/main/java/org/htmlunit/javascript/host/performance/Performance.java
@@ -86,7 +86,7 @@ public double now() {
      */
     @JsxFunction
     public Scriptable getEntries() {
-        return JavaScriptEngine.newArray(this, 0);
+        return JavaScriptEngine.newArray(getParentScope(), 0);
     }
 
     /**
@@ -98,7 +98,7 @@ public Scriptable getEntries() {
      */
     @JsxFunction
     public Scriptable getEntriesByName() {
-        return JavaScriptEngine.newArray(this, 0);
+        return JavaScriptEngine.newArray(getParentScope(), 0);
     }
 
     /**
@@ -108,6 +108,6 @@ public Scriptable getEntriesByName() {
      */
     @JsxFunction
     public Scriptable getEntriesByType() {
-        return JavaScriptEngine.newArray(this, 0);
+        return JavaScriptEngine.newArray(getParentScope(), 0);
     }
 }
diff --git a/src/main/java/org/htmlunit/javascript/host/worker/WorkerNavigator.java b/src/main/java/org/htmlunit/javascript/host/worker/WorkerNavigator.java
@@ -112,7 +112,7 @@ public String getLanguage() {
     public Scriptable getLanguages() {
         final String acceptLang = getBrowserVersion().getAcceptLanguageHeader();
         if (StringUtils.isEmptyOrNull(acceptLang)) {
-            return JavaScriptEngine.newArray(this, 0);
+            return JavaScriptEngine.newArray(getParentScope(), 0);
         }
 
         final ArrayList<String> res = new ArrayList<>();
@@ -126,7 +126,7 @@ public Scriptable getLanguages() {
             }
         }
 
-        return JavaScriptEngine.newArray(this, res.toArray());
+        return JavaScriptEngine.newArray(getParentScope(), res.toArray());
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/javascript/host/xml/FormData.java b/src/main/java/org/htmlunit/javascript/host/xml/FormData.java
@@ -213,7 +213,7 @@ public String get(final String name) {
     @JsxFunction
     public Scriptable getAll(final String name) {
         if (StringUtils.isEmptyOrNull(name)) {
-            return JavaScriptEngine.newArray(this, 0);
+            return JavaScriptEngine.newArray(getParentScope(), 0);
         }
 
         final List<Object> values = new ArrayList<>();
@@ -224,7 +224,7 @@ public Scriptable getAll(final String name) {
         }
 
         final Object[] stringValues = values.toArray(new Object[0]);
-        return JavaScriptEngine.newArray(this, stringValues);
+        return JavaScriptEngine.newArray(getParentScope(), stringValues);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -686,15 +686,15 @@ public Scriptable getAttributeNames() {`
`686`	`686`	`final org.w3c.dom.NamedNodeMap attributes = getDomNodeOrDie().getAttributes();`
`687`	`687`
`688`	`688`	`if (attributes.getLength() == 0) {`
`689`		`- return JavaScriptEngine.newArray(this, 0);`
	`689`	`+ return JavaScriptEngine.newArray(getParentScope(), 0);`
`690`	`690`	`}`
`691`	`691`
`692`	`692`	`final ArrayList<String> res = new ArrayList<>();`
`693`	`693`	`for (int i = 0; i < attributes.getLength(); i++) {`
`694`	`694`	`res.add(attributes.item(i).getNodeName());`
`695`	`695`	`}`
`696`	`696`
`697`		`- return JavaScriptEngine.newArray(this, res.toArray());`
	`697`	`+ return JavaScriptEngine.newArray(getParentScope(), res.toArray());`
`698`	`698`	`}`
`699`	`699`
`700`	`700`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public String getLanguage() {`
`107`	`107`	`public Scriptable getLanguages() {`
`108`	`108`	`final String acceptLang = getBrowserVersion().getAcceptLanguageHeader();`
`109`	`109`	`if (StringUtils.isEmptyOrNull(acceptLang)) {`
`110`		`- return JavaScriptEngine.newArray(this, 0);`
	`110`	`+ return JavaScriptEngine.newArray(getParentScope(), 0);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`final ArrayList<String> res = new ArrayList<>();`
`@@ -121,7 +121,7 @@ public Scriptable getLanguages() {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`- return JavaScriptEngine.newArray(this, res.toArray());`
	`124`	`+ return JavaScriptEngine.newArray(getParentScope(), res.toArray());`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ public Scriptable getAll(final String name) {`
`365`	`365`	`}`
`366`	`366`	`}`
`367`	`367`
`368`		`- return JavaScriptEngine.newArray(getWindow(this), result.toArray());`
	`368`	`+ return JavaScriptEngine.newArray(getParentScope(), result.toArray());`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public Scriptable getAlgorithm() {`
`134`	`134`	`*/`
`135`	`135`	`@JsxGetter`
`136`	`136`	`public Scriptable getUsages() {`
`137`		`- return JavaScriptEngine.newArray(this, usages_.toArray());`
	`137`	`+ return JavaScriptEngine.newArray(getParentScope(), usages_.toArray());`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public double now() {`
`86`	`86`	`*/`
`87`	`87`	`@JsxFunction`
`88`	`88`	`public Scriptable getEntries() {`
`89`		`- return JavaScriptEngine.newArray(this, 0);`
	`89`	`+ return JavaScriptEngine.newArray(getParentScope(), 0);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`/**`
`@@ -98,7 +98,7 @@ public Scriptable getEntries() {`
`98`	`98`	`*/`
`99`	`99`	`@JsxFunction`
`100`	`100`	`public Scriptable getEntriesByName() {`
`101`		`- return JavaScriptEngine.newArray(this, 0);`
	`101`	`+ return JavaScriptEngine.newArray(getParentScope(), 0);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`
`@@ -108,6 +108,6 @@ public Scriptable getEntriesByName() {`
`108`	`108`	`*/`
`109`	`109`	`@JsxFunction`
`110`	`110`	`public Scriptable getEntriesByType() {`
`111`		`- return JavaScriptEngine.newArray(this, 0);`
	`111`	`+ return JavaScriptEngine.newArray(getParentScope(), 0);`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public String getLanguage() {`
`112`	`112`	`public Scriptable getLanguages() {`
`113`	`113`	`final String acceptLang = getBrowserVersion().getAcceptLanguageHeader();`
`114`	`114`	`if (StringUtils.isEmptyOrNull(acceptLang)) {`
`115`		`- return JavaScriptEngine.newArray(this, 0);`
	`115`	`+ return JavaScriptEngine.newArray(getParentScope(), 0);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`final ArrayList<String> res = new ArrayList<>();`
`@@ -126,7 +126,7 @@ public Scriptable getLanguages() {`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`129`		`- return JavaScriptEngine.newArray(this, res.toArray());`
	`129`	`+ return JavaScriptEngine.newArray(getParentScope(), res.toArray());`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ public String get(final String name) {`
`213`	`213`	`@JsxFunction`
`214`	`214`	`public Scriptable getAll(final String name) {`
`215`	`215`	`if (StringUtils.isEmptyOrNull(name)) {`
`216`		`- return JavaScriptEngine.newArray(this, 0);`
	`216`	`+ return JavaScriptEngine.newArray(getParentScope(), 0);`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`final List<Object> values = new ArrayList<>();`
`@@ -224,7 +224,7 @@ public Scriptable getAll(final String name) {`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`final Object[] stringValues = values.toArray(new Object[0]);`
`227`		`- return JavaScriptEngine.newArray(this, stringValues);`
	`227`	`+ return JavaScriptEngine.newArray(getParentScope(), stringValues);`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`/**`