Constructor injection for IWindow

Author: FlorianRappl

AngleSharp.Scripting.JavaScript/Dom/XmlHttpRequest.cs

@@ -20,6 +20,8 @@ public sealed class XmlHttpRequest : XmlHttpRequestEventTarget, IRequest
         #region Fields
 
         readonly Dictionary<String, String> _headers;
+        readonly IWindow _window;
+
         RequesterState _readyState;
         Int32 _timeout;
         Boolean _credentials;
@@ -38,8 +40,9 @@ public sealed class XmlHttpRequest : XmlHttpRequestEventTarget, IRequest
         /// Creates a new XHR.
         /// </summary>
         [DomConstructor]
-        public XmlHttpRequest()
+        public XmlHttpRequest(IWindow window)
         {
+            _window = window;
             _async = true;
             _method = HttpMethod.Get;
             _url = null;

AngleSharp.Scripting.JavaScript/EngineInstance.cs

@@ -34,6 +34,11 @@ public EngineInstance(IWindow window, IDictionary<String, Object> assignments)
             this.AddConstructors(_window, this.GetType());
         }
 
+        public DomNodeInstance Window
+        {
+            get { return _window; }
+        }
+
         public DomConstructors Constructors
         {
             get { return _constructors; }

AngleSharp.Scripting.JavaScript/Extensions.cs

@@ -1,6 +1,7 @@
 namespace AngleSharp.Scripting.JavaScript
 {
     using AngleSharp.Attributes;
+    using AngleSharp.Dom;
     using Jint;
     using Jint.Native;
     using Jint.Native.Function;
@@ -131,16 +132,20 @@ public static Object[] BuildArgs(this EngineInstance context, MethodBase method,
             var parameters = method.GetParameters();
             var max = parameters.Length;
             var args = new Object[max];
+            var offset = 0;
+
+            if (parameters.Length > 0 && parameters[0].ParameterType == typeof(IWindow))
+                args[offset++] = context.Window.Value;
 
             if (max > 0 && parameters[max - 1].GetCustomAttribute<ParamArrayAttribute>() != null)
                 max--;
 
-            var n = Math.Min(arguments.Length, max);
+            var n = Math.Min(arguments.Length - offset, max);
 
             for (int i = 0; i < n; i++)
-                args[i] = arguments[i].FromJsValue().As(parameters[i].ParameterType, context);
+                args[i + offset] = arguments[i].FromJsValue().As(parameters[i].ParameterType, context);
 
-            for (int i = n; i < max; i++)
+            for (int i = n + offset; i < max; i++)
                 args[i] = parameters[i].IsOptional ? parameters[i].DefaultValue : parameters[i].ParameterType.GetDefaultValue();
 
             if (max != parameters.Length)