scope handling fix (wip)

Author: rbri

src/main/java/org/htmlunit/WebWindow.java

@@ -16,7 +16,6 @@
 
 import java.io.Serializable;
 
-import org.htmlunit.corejs.javascript.TopLevel;
 import org.htmlunit.css.ComputedCssStyleDeclaration;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.javascript.HtmlUnitScriptable;
@@ -77,9 +76,6 @@ public interface WebWindow extends Serializable {
      */
     WebWindow getTopWindow();
 
-    TopLevel getTopLevelScope();
-    void setTopLevelScope(TopLevel topLevelScope);
-
     /**
      * Returns the web client that "owns" this window.
      *

src/main/java/org/htmlunit/WebWindowImpl.java

@@ -186,22 +186,6 @@ public <T> T getScriptableObject() {
         return (T) scriptObject_;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setTopLevelScope(final TopLevel topLevelScope) {
-        topLevelScope_ = topLevelScope;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public TopLevel getTopLevelScope() {
-        return topLevelScope_;
-    }
-
     /**
      * {@inheritDoc}
      */

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

@@ -64,6 +64,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.Script;
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.ScriptableObject;
 import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.css.ComputedCssStyleDeclaration;
 import org.htmlunit.css.CssStyleSheet;
@@ -950,8 +951,11 @@ public ScriptResult executeJavaScript(String sourceCode, final String sourceName
             }
         }
 
+        final Window window = getEnclosingWindow().getScriptableObject();
+        final VarScope scope = ScriptableObject.getTopLevelScope(window.getParentScope());
+
         final Object result = getWebClient().getJavaScriptEngine()
-                .execute(this, getEnclosingWindow().getTopLevelScope(), sourceCode, sourceName, startLine);
+                .execute(this, scope, sourceCode, sourceName, startLine);
         return new ScriptResult(result);
     }
 
@@ -1029,9 +1033,12 @@ JavaScriptLoadResult loadExternalJavaScriptFile(final String srcAttribute, final
             return JavaScriptLoadResult.COMPILATION_ERROR;
         }
 
+        final Window window = getEnclosingWindow().getScriptableObject();
+        final VarScope scope = ScriptableObject.getTopLevelScope(window.getParentScope());
+
         @SuppressWarnings("unchecked")
         final AbstractJavaScriptEngine<Object> engine = (AbstractJavaScriptEngine<Object>) client.getJavaScriptEngine();
-        engine.execute(this, getEnclosingWindow().getTopLevelScope(), script);
+        engine.execute(this, scope, script);
         return JavaScriptLoadResult.SUCCESS;
     }
 
@@ -1119,7 +1126,10 @@ else if (!MimeType.isJavascriptMimeType(contentType)) {
         final String scriptCode = response.getContentAsString(scriptEncoding);
         if (null != scriptCode) {
             final AbstractJavaScriptEngine<?> javaScriptEngine = client.getJavaScriptEngine();
-            final VarScope scope = getEnclosingWindow().getTopLevelScope();
+
+            final Window window = getEnclosingWindow().getScriptableObject();
+            final VarScope scope = ScriptableObject.getTopLevelScope(window.getParentScope());
+
             final Object script = javaScriptEngine.compile(this, scope, scriptCode, url.toExternalForm(), 1);
             if (script != null && cache.cacheIfPossible(request, response, script)) {
                 // no cleanup if the response is stored inside the cache

src/main/java/org/htmlunit/javascript/JavaScriptEngine.java

@@ -832,7 +832,21 @@ public Object callFunction(
             final Object[] args,
             final DomNode node) {
 
-        final VarScope scope = getScope(page, node);
+        VarScope scope = ScriptableObject.getTopLevelScope(thisObject.getParentScope());
+
+        if (node != null && node instanceof HtmlElement htmlElement) {
+            final HTMLElement elem = htmlElement.getScriptableObject();
+            scope = new WithScope(scope, elem.getOwnerDocument());
+
+            if (htmlElement instanceof SubmittableElement) {
+                final HtmlForm enclosingForm = htmlElement.getEnclosingForm();
+                if (enclosingForm != null) {
+                    scope = new WithScope(scope, enclosingForm.getScriptableObject());
+                }
+            }
+
+            scope = new WithScope(scope, node.getScriptableObject());
+        }
 
         return callFunction(page, javaScriptFunction, scope, thisObject, args);
     }
@@ -869,25 +883,6 @@ protected String getSourceCode(final Context cx) {
         return getContextFactory().callSecured(action, page);
     }
 
-    private static VarScope getScope(final HtmlPage page, final DomNode node) {
-        final TopLevel topLevel = page.getEnclosingWindow().getTopLevelScope();
-        if (node != null && node instanceof HtmlElement htmlElement) {
-            final HTMLElement elem = htmlElement.getScriptableObject();
-            WithScope scope = new WithScope(topLevel, elem.getOwnerDocument());
-
-            if (htmlElement instanceof SubmittableElement) {
-                final HtmlForm enclosingForm = htmlElement.getEnclosingForm();
-                if (enclosingForm != null) {
-                    scope = new WithScope(scope, enclosingForm.getScriptableObject());
-                }
-            }
-
-            return new WithScope(scope, node.getScriptableObject());
-        }
-
-        return topLevel;
-    }
-
     /**
      * Indicates if JavaScript is running in current thread.
      * <p>This allows code to know if their own evaluation has been triggered by some JS code.

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

@@ -149,11 +149,10 @@ public void postMessage(final Object message) {
             for (final BroadcastChannel channel : broadcastChannels) {
                 if (channel != this && name_.equals(channel.name_)) {
                     final Window channelWindow = channel.getWindow();
-                    final WebWindow channelWebWindow = channelWindow.getWebWindow();
-                    final Page channelPage = channelWebWindow.getEnclosedPage();
+                    final Page channelPage = channelWindow.getWebWindow().getEnclosedPage();
 
                     if (UrlUtils.isSameOrigin(currentURL, channelPage.getUrl())) {
-                        final TopLevel scope = channelWebWindow.getTopLevelScope();
+                        final TopLevel scope = getTopLevelScope(channelWindow.getParentScope());
                         final Scriptable ports = JavaScriptEngine.newArray(scope, 0);
 
                         final MessageEvent event = new MessageEvent();

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

@@ -125,7 +125,7 @@ public void setDomNode(final DomNode domNode) {
         super.setDomNode(domNode);
 
         final Window window = getWindow();
-        setParentScope(new WithScope(window.getWebWindow().getTopLevelScope(), window.getDocument()));
+        setParentScope(new WithScope(getTopLevelScope(getParentScope()), window.getDocument()));
         // CSSStyleDeclaration uses the parent scope
         style_ = new CSSStyleDeclaration(this, new ElementCssStyleDeclaration(getDomNodeOrDie()));
 

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

@@ -75,7 +75,7 @@ public Storage(final Window window, final Map<String, String> store) {
         super();
         store_ = store;
         storeSize_ = 0L;
-        setParentScope(window.getWebWindow().getTopLevelScope());
+        setParentScope(getTopLevelScope(window.getParentScope()));
         setPrototype(window.getPrototype(Storage.class));
     }
 

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

@@ -759,7 +759,6 @@ public External getExternal() {
     public void initialize(final TopLevel scope, final WebWindow webWindow, final Page pageToEnclose) {
         webWindow_ = webWindow;
         webWindow_.setScriptableObject(this);
-        webWindow.setTopLevelScope(scope);
 
         defineProperty(scope, "length", null, GETTER_LENGTH, SETTER_LENGTH, ScriptableObject.READONLY);
         defineProperty(scope, "self", null, GETTER_SELF, SETTER_SELF, ScriptableObject.READONLY);
@@ -1423,7 +1422,7 @@ public void triggerOnError(final ScriptException e) {
             final int line = e.getFailingLineNumber();
             final int column = e.getFailingColumnNumber();
 
-            final TopLevel scope = getWebWindow().getTopLevelScope();
+            final TopLevel scope = getTopLevelScope(getParentScope());
 
             Object jsError = e.getMessage();
             if (e.getCause() instanceof JavaScriptException) {
@@ -1769,7 +1768,7 @@ public Selection getSelection() {
     public Selection getSelectionImpl() {
         if (selection_ == null) {
             selection_ = new Selection();
-            selection_.setParentScope(getWebWindow().getTopLevelScope());
+            selection_.setParentScope(getParentScope());
             selection_.setPrototype(getPrototype(selection_.getClass()));
         }
         return selection_;
@@ -2079,7 +2078,7 @@ public static int getPort(final URL url) {
     public Scriptable getPerformance() {
         if (performance_ == null) {
             final Performance performance = new Performance();
-            performance.setParentScope(getWebWindow().getTopLevelScope());
+            performance.setParentScope(getParentScope());
             performance.setPrototype(getPrototype(performance.getClass()));
             performance_ = performance;
         }

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.getWebWindow().getTopLevelScope());
+        setParentScope(getTopLevelScope(window.getParentScope()));
         setPrototype(window.getPrototype(Crypto.class));
     }
 

src/main/java/org/htmlunit/javascript/host/css/StyleSheetList.java

@@ -87,7 +87,7 @@ public StyleSheetList(final Document document) {
         super();
 
         final WebWindow webWindow = document.getWindow().getWebWindow();
-        setParentScope(new WithScope(webWindow.getTopLevelScope(), document));
+        setParentScope(new WithScope(getTopLevelScope(document.getParentScope()), document));
         setPrototype(getPrototype(getClass()));
 
         final WebClient webClient = webWindow.getWebClient();