Improved connection to weakly bound document

Dim0N22 · Dec 26, 2015 · c4520bb · c4520bb
1 parent ea6f190
commit c4520bb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/AngleSharp/Dom/Html/HtmlLinkElement.cs b/AngleSharp/Dom/Html/HtmlLinkElement.cs
@@ -6,7 +6,6 @@
     using AngleSharp.Network;
     using AngleSharp.Services.Styling;
     using System;
-    using System.Threading.Tasks;
 
     /// <summary>
     /// Represents the HTML link element.

diff --git a/AngleSharp/Dom/Html/HtmlScriptElement.cs b/AngleSharp/Dom/Html/HtmlScriptElement.cs
@@ -176,9 +176,9 @@ void RunFromSource()
         /// More information available at:
         /// http://www.w3.org/TR/html5/scripting-1.html#prepare-a-script
         /// </summary>
-        internal Boolean Prepare()
+        internal Boolean Prepare(Document document)
         {
-            var options = Owner.Options;
+            var options = document.Options;
             var eventAttr = this.GetOwnAttribute(AttributeNames.Event);
             var forAttr = this.GetOwnAttribute(AttributeNames.For);
             var src = Source;
@@ -231,14 +231,14 @@ internal Boolean Prepare()
             {
                 if (src.Length != 0)
                 {
-                    return InvokeLoadingScript(this.HyperReference(src));
+                    return InvokeLoadingScript(document, this.HyperReference(src));
                 }
-                    
-                Owner.QueueTask(FireErrorEvent);
+
+                document.QueueTask(FireErrorEvent);
             }
             else 
             {
-                if (_parserInserted && Owner.GetStyleSheetDownloads().Any())
+                if (_parserInserted && document.GetStyleSheetDownloads().Any())
                 {
                     _runScript = RunFromSource;
                     return true;
@@ -250,10 +250,9 @@ internal Boolean Prepare()
             return false;
         }
 
-        Boolean InvokeLoadingScript(Url url)
+        Boolean InvokeLoadingScript(Document document, Url url)
         {
             var fromParser = true;
-            var document = Owner;
 
             //Just add to the (end of) set of scripts
             if (!_parserInserted || IsDeferred || IsAsync)
@@ -304,10 +303,13 @@ void FireAfterScriptExecuteEvent()
 
         ScriptOptions CreateOptions()
         {
+            var document = Owner;
+            var context = document != null ? document.DefaultView : null;
+
             return new ScriptOptions
             {
-                Context = Owner.DefaultView,
-                Document = Owner,
+                Context = context,
+                Document = document,
                 Element = this,
                 Encoding = TextEncoding.Resolve(CharacterSet)
             };

diff --git a/AngleSharp/Network/Default/BaseLoader.cs b/AngleSharp/Network/Default/BaseLoader.cs
@@ -94,7 +94,10 @@ protected virtual IDownload DownloadAsync(Request request, INode originator)
         /// <returns>The enumerable over all active downloads.</returns>
         public IEnumerable<IDownload> GetDownloads()
         {
-            return _downloads.ToArray();
+            lock (this)
+            {
+                return _downloads.ToArray();
+            }
         }
 
         /// <summary>
@@ -115,7 +118,9 @@ protected async Task<IResponse> LoadAsync(Request request, CancellationToken can
                     var evt = new RequestStartEvent(requester, request);
 
                     if (events != null)
+                    {
                         events.Publish(evt);
+                    }
 
                     var result = await requester.RequestAsync(request, cancel).ConfigureAwait(false);
                     evt.FireEnd();

diff --git a/AngleSharp/Parser/Html/HtmlDomBuilder.cs b/AngleSharp/Parser/Html/HtmlDomBuilder.cs
@@ -3447,7 +3447,7 @@ void HandleScript(HtmlScriptElement script)
                 CloseCurrentNode();
                 _currentMode = _previousMode;
 
-                if (script.Prepare())
+                if (script.Prepare(_document))
                 {
                     _waiting = RunScript(script);
                 }