scope handling (wip)

Author: rbri

src/main/java/org/htmlunit/html/HtmlPage.java

@@ -1028,7 +1028,7 @@ JavaScriptLoadResult loadExternalJavaScriptFile(final String srcAttribute, final
 
         @SuppressWarnings("unchecked")
         final AbstractJavaScriptEngine<Object> engine = (AbstractJavaScriptEngine<Object>) client.getJavaScriptEngine();
-        engine.execute(this, getEnclosingWindow().getScriptableObject(), script);
+        engine.execute(this, getEnclosingWindow().getTopLevelScope(), script);
         return JavaScriptLoadResult.SUCCESS;
     }
 

src/main/java/org/htmlunit/javascript/host/Window.java

@@ -1766,7 +1766,7 @@ public Selection getSelection() {
     public Selection getSelectionImpl() {
         if (selection_ == null) {
             selection_ = new Selection();
-            selection_.setParentScope(this);
+            selection_.setParentScope(getWebWindow().getTopLevelScope());
             selection_.setPrototype(getPrototype(selection_.getClass()));
         }
         return selection_;
@@ -2075,7 +2075,7 @@ public static int getPort(final URL url) {
     public Scriptable getPerformance() {
         if (performance_ == null) {
             final Performance performance = new Performance();
-            performance.setParentScope(this);
+            performance.setParentScope(getWebWindow().getTopLevelScope());
             performance.setPrototype(getPrototype(performance.getClass()));
             performance_ = performance;
         }

src/main/java/org/htmlunit/javascript/host/canvas/ImageData.java

@@ -18,6 +18,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.TopLevel;
 import org.htmlunit.corejs.javascript.typedarrays.NativeArrayBuffer;
 import org.htmlunit.corejs.javascript.typedarrays.NativeUint8ClampedArray;
 import org.htmlunit.javascript.HtmlUnitScriptable;
@@ -72,7 +73,7 @@ public static ImageData jsConstructor(final Context cx, final Scriptable scope,
             data = array;
             if (data.getArrayLength() % 4 != 0) {
                 throw JavaScriptEngine.asJavaScriptException(
-                        (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                        (HtmlUnitScriptable) ((TopLevel) JavaScriptEngine.getTopCallScope()).getGlobalThis(),
                         "ImageData ctor - data length mod 4 not zero",
                         DOMException.INVALID_STATE_ERR);
             }
@@ -83,7 +84,7 @@ public static ImageData jsConstructor(final Context cx, final Scriptable scope,
 
                 if (data.getArrayLength() != 4 * width * height) {
                     throw JavaScriptEngine.asJavaScriptException(
-                            (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                            (HtmlUnitScriptable) ((TopLevel) JavaScriptEngine.getTopCallScope()).getGlobalThis(),
                             "ImageData ctor - width not correct",
                             DOMException.INDEX_SIZE_ERR);
                 }
@@ -94,7 +95,7 @@ public static ImageData jsConstructor(final Context cx, final Scriptable scope,
 
             if (data.getArrayLength() != 4 * width * height) {
                 throw JavaScriptEngine.asJavaScriptException(
-                        (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                        (HtmlUnitScriptable) ((TopLevel) JavaScriptEngine.getTopCallScope()).getGlobalThis(),
                         "ImageData ctor - width/height not correct",
                         DOMException.INDEX_SIZE_ERR);
             }
@@ -106,13 +107,13 @@ public static ImageData jsConstructor(final Context cx, final Scriptable scope,
 
         if (width < 0) {
             throw JavaScriptEngine.asJavaScriptException(
-                    (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                    (HtmlUnitScriptable) ((TopLevel) JavaScriptEngine.getTopCallScope()).getGlobalThis(),
                     "ImageData ctor - width negative",
                     DOMException.INDEX_SIZE_ERR);
         }
         if (height < 0) {
             throw JavaScriptEngine.asJavaScriptException(
-                    (HtmlUnitScriptable) JavaScriptEngine.getTopCallScope(),
+                    (HtmlUnitScriptable) ((TopLevel) JavaScriptEngine.getTopCallScope()).getGlobalThis(),
                     "ImageData ctor - height negative",
                     DOMException.INDEX_SIZE_ERR);
         }

src/main/java/org/htmlunit/javascript/host/crypto/Crypto.java

@@ -60,7 +60,7 @@ public void jsConstructor() {
      */
     public Crypto(final Window window) {
         this();
-        setParentScope(window);
+        setParentScope(window.getWebWindow().getTopLevelScope());
         setPrototype(window.getPrototype(Crypto.class));
     }
 

src/main/java/org/htmlunit/javascript/host/event/EventListenersContainer.java

@@ -29,6 +29,7 @@
 import org.htmlunit.corejs.javascript.NativeObject;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.TopLevel;
 import org.htmlunit.html.DomNode;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.javascript.JavaScriptEngine;
@@ -281,7 +282,10 @@ private void executeEventListeners(final int eventPhase, final Event event, fina
                 page = (HtmlPage) jsNode_.getDomNodeOrDie();
             }
             else {
-                final Scriptable parentScope = jsNode_.getParentScope();
+                Scriptable parentScope = jsNode_.getParentScope();
+                if (parentScope instanceof TopLevel topLevel) {
+                    parentScope = topLevel.getGlobalThis();
+                }
                 if (parentScope instanceof Window window) {
                     page = (HtmlPage) window.getDomNodeOrDie();
                 }

src/main/java/org/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java

@@ -128,6 +128,7 @@ public void jsConstructor() {
 
         final TopLevel scope = context.initSafeStandardObjects(new TopLevel(this));
         this.setParentScope(scope);
+
         JavaScriptEngine.configureRhino(webClient, browserVersion, scope, this);
 
         final WorkerJavaScriptConfiguration jsConfig = WorkerJavaScriptConfiguration.getInstance(browserVersion);