scope handling fix (wip)

Author: rbri

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

@@ -190,7 +190,7 @@ public VarScope getParentScope() {
      * {@inheritDoc}
      */
     @Override
-    public void setParentScope(final Scriptable scope) {
+    public void setParentScope(final VarScope scope) {
         wrapped_.setParentScope(scope);
     }
 

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

@@ -94,7 +94,7 @@ public void setClassName(final String className) {
      * {@inheritDoc}
      */
     @Override
-    public void setParentScope(final Scriptable scope) {
+    public void setParentScope(final VarScope scope) {
         if (scope == this) {
             throw new IllegalArgumentException("Object can't be its own parentScope");
         }

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

@@ -39,6 +39,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.corejs.javascript.VarScope;
 import org.htmlunit.corejs.javascript.WithScope;
 import org.htmlunit.css.ComputedCssStyleDeclaration;
@@ -662,7 +663,7 @@ public HTMLCollection getElementsByClassName(final String className) {
      */
     @JsxFunction
     public DOMRectList getClientRects() {
-        final Scriptable topScope = getTopLevelScope(getParentScope());
+        final TopLevel topScope = getTopLevelScope(getParentScope());
         final DOMRectList rectList = new DOMRectList();
         rectList.setParentScope(topScope);
         rectList.setPrototype(getPrototype(rectList.getClass()));

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

@@ -15,7 +15,7 @@
 package org.htmlunit.javascript.host;
 
 import org.htmlunit.WebWindow;
-import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.javascript.HtmlUnitScriptableProxy;
 
 /**
@@ -50,7 +50,7 @@ public Window getDelegee() {
      * @param parent the new parent scope
      */
     @Override
-    public void setParentScope(final Scriptable parent) {
+    public void setParentScope(final VarScope parent) {
         // nothing as the window is the top level scope and its parent scope should stay null
     }
 }

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

@@ -21,7 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.css.CssStyleSheet;
 import org.htmlunit.cssparser.dom.AbstractCSSRuleImpl;
 import org.htmlunit.cssparser.dom.CSSCharsetRuleImpl;
@@ -121,7 +121,7 @@ public CSSStyleSheet(final HTMLElement element, final String styleSheet, final S
      * @param parentScope the parent scope
      * @param cssStyleSheet the CSS stylesheet which this stylesheet host object represents
      */
-    public CSSStyleSheet(final HTMLElement element, final Scriptable parentScope,
+    public CSSStyleSheet(final HTMLElement element, final VarScope parentScope,
             final CssStyleSheet cssStyleSheet) {
         super(element);
 

src/main/java/org/htmlunit/javascript/host/file/FileList.java

@@ -17,6 +17,7 @@
 import java.util.ArrayList;
 
 import org.htmlunit.corejs.javascript.Scriptable;
+import org.htmlunit.corejs.javascript.VarScope;
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
@@ -77,7 +78,7 @@ public void updateFiles(final ArrayList<File> files) {
      * {@inheritDoc}
      */
     @Override
-    public void setParentScope(final Scriptable scope) {
+    public void setParentScope(final VarScope scope) {
         super.setParentScope(scope);
         if (files_ != null) {
             for (final File file : files_) {