scope handling (wip)

Author: rbri

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

@@ -19,8 +19,6 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.JavaScriptException;
 import org.htmlunit.corejs.javascript.Scriptable;
-import org.htmlunit.corejs.javascript.ScriptableObject;
-import org.htmlunit.corejs.javascript.TopLevel;
 import org.htmlunit.html.DomNode;
 
 /**
@@ -65,10 +63,9 @@ public Object call(final Context cx, final Scriptable scope,
         // compile "just in time"
         if (realFunction_ == null) {
             final String js = "function on" + eventName_ + "(event) { " + jsSnippet_ + " \n}";
-            final TopLevel topLevelScope = ((ScriptableObject) thisObj).getTopLevelScope(thisObj);
-            realFunction_ = cx.compileFunction(topLevelScope, js, eventName_ + " event for " + node_
+            realFunction_ = cx.compileFunction(scope, js, eventName_ + " event for " + node_
                                     + " in " + node_.getPage().getUrl(), 0, null);
-            realFunction_.setParentScope(topLevelScope);
+            realFunction_.setParentScope(scope);
         }
 
         return realFunction_.call(cx, scope, thisObj, args);

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

@@ -305,7 +305,7 @@ void executeEvent(final Context cx, final MessageEvent event) {
         final Function handlerFunction = getEventHandler(Event.TYPE_MESSAGE);
         if (handlerFunction != null) {
             final Object[] args = {event};
-            handlerFunction.call(cx, this, this, args);
+            handlerFunction.call(cx, getParentScope(), this, args);
         }
     }