scope handling fix (wip)

Author: rbri

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

@@ -2576,26 +2576,21 @@ public void setSelectionRange(final SimpleRange selectionRange) {
      * @param function the JavaScript Function to call
      * @param thisObject the "this" object to be used during invocation
      * @param args the arguments to pass into the call
-     * @param htmlElementScope the HTML element for which this script is being executed
+     * @param htmlElement the HTML element for which this script is being executed
      *        This element will be the context during the JavaScript execution. If null,
      *        the context will default to the page.
      * @return a ScriptResult which will contain both the current page (which may be different from
      *        the previous page) and a JavaScript result object.
      */
     public ScriptResult executeJavaScriptFunction(final Object function, final Object thisObject,
-            final Object[] args, final DomNode htmlElementScope) {
+            final Object[] args, final DomNode htmlElement) {
         if (!getWebClient().isJavaScriptEnabled()) {
             return new ScriptResult(null);
         }
 
-        return executeJavaScriptFunction((Function) function, (Scriptable) thisObject, args, htmlElementScope);
-    }
-
-    private ScriptResult executeJavaScriptFunction(final Function function, final Scriptable thisObject,
-            final Object[] args, final DomNode htmlElementScope) {
-
         final JavaScriptEngine engine = (JavaScriptEngine) getWebClient().getJavaScriptEngine();
-        final Object result = engine.callFunction(this, function, thisObject, args, htmlElementScope);
+        final Object result = engine.callFunction(this,
+                                (Function) function, (Scriptable) thisObject, args, htmlElement);
 
         return new ScriptResult(result);
     }

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

@@ -306,7 +306,7 @@ public static ImageData createImageData(final Context context, final VarScope sc
         if (args.length > 0 && args[0] instanceof ImageData imageDataParameter) {
             final ImageData imageData = new ImageData(null,
                     0, 0, imageDataParameter.getWidth(), imageDataParameter.getHeight());
-            imageData.setParentScope(canvas.getParentScope());
+            imageData.setParentScope(scope);
             imageData.setPrototype(canvas.getPrototype(imageData.getClass()));
             return imageData;
         }

src/main/java/org/htmlunit/javascript/host/draganddrop/DataTransferItemList.java

@@ -81,7 +81,7 @@ public static DataTransferItem add(final Context context, final VarScope scope,
         if (args.length == 1) {
             if (args[0] instanceof File file) {
                 final DataTransferItem item = DataTransferItem.buildFileItem(file);
-                item.setParentScope(itemList.getParentScope());
+                item.setParentScope(scope);
                 item.setPrototype(itemList.getPrototype(item.getClass()));
 
                 if (itemList.items_ == null) {
@@ -100,7 +100,7 @@ public static DataTransferItem add(final Context context, final VarScope scope,
             final String data = JavaScriptEngine.toString(args[0]);
             final String type = JavaScriptEngine.toString(args[1]);
             final DataTransferItem item = DataTransferItem.buildStringItem(data, type);
-            item.setParentScope(itemList.getParentScope());
+            item.setParentScope(scope);
             item.setPrototype(itemList.getPrototype(item.getClass()));
 
             if (itemList.items_ == null) {