scope handling fix (wip)

Author: rbri

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

@@ -16,6 +16,7 @@
 
 import org.htmlunit.corejs.javascript.Context;
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.corejs.javascript.debug.DebugFrame;
 
 /**
@@ -35,7 +36,7 @@ public void onDebuggerStatement(final Context cx) {
 
     /** {@inheritDoc} */
     @Override
-    public void onEnter(final Context cx, final Scriptable activation, final Scriptable thisObj, final Object[] args) {
+    public void onEnter(final Context cx, final VarScope activation, final Scriptable thisObj, final Object[] args) {
         // Empty.
     }
 

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

@@ -25,6 +25,7 @@
 import org.htmlunit.corejs.javascript.NativeFunction;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.corejs.javascript.debug.DebuggableScript;
 import org.htmlunit.javascript.host.event.Event;
 
@@ -74,7 +75,7 @@ public DebugFrameImpl(final DebuggableScript functionOrScript) {
      * {@inheritDoc}
      */
     @Override
-    public void onEnter(final Context cx, final Scriptable activation, final Scriptable thisObj, final Object[] args) {
+    public void onEnter(final Context cx, final VarScope activation, final Scriptable thisObj, final Object[] args) {
         if (LOG.isTraceEnabled()) {
             final StringBuilder sb = new StringBuilder();
 

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

@@ -57,7 +57,7 @@ private WindowOrWorkerGlobalScopeMixin() {
     /**
      * Decodes a string of data which has been encoded using base-64 encoding.
      * @param encodedData the encoded string
-     * @param scriptable the HtmlUnitScriptable scope
+     * @param scriptable the HtmlUnitScriptable
      * @return the decoded value
      */
     public static String atob(final String encodedData, final HtmlUnitScriptable scriptable) {
@@ -77,7 +77,7 @@ public static String atob(final String encodedData, final HtmlUnitScriptable scr
     /**
      * Creates a base-64 encoded ASCII string from a string of binary data.
      * @param stringToEncode string to encode
-     * @param scriptable the HtmlUnitScriptable scope
+     * @param scriptable the HtmlUnitScriptable
      * @return the encoded string
      */
     public static String btoa(final String stringToEncode, final HtmlUnitScriptable scriptable) {

src/main/java/org/htmlunit/javascript/host/xml/FormData.java

@@ -97,7 +97,7 @@ public FormDataIterator(final String className) {
          * @param type the type
          * @param nameValuePairList the list of name value pairs
          */
-        public FormDataIterator(final Scriptable scope, final String className, final Type type,
+        public FormDataIterator(final VarScope scope, final String className, final Type type,
                 final List<NameValuePair> nameValuePairList) {
             super(scope, FORM_DATA_TAG);
             type_ = type;
@@ -298,7 +298,8 @@ public void set(final String name, final Object value, final Object filename) {
     @JsxFunction
     @JsxSymbol(symbolName = "iterator")
     public Scriptable entries() {
-        return new FormDataIterator(this, "FormData Iterator", FormDataIterator.Type.BOTH, requestParameters_);
+        return new FormDataIterator(getParentScope(),
+                    "FormData Iterator", FormDataIterator.Type.BOTH, requestParameters_);
     }
 
     /**