Fix repetititive setContent calls (#907)

* Fix repetitative setContent calls

* Fix watcher order

Author: kblok

lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs

@@ -46,7 +46,7 @@ public async Task ShouldWorkWithHtml4Doctype()
         }
 
         [Fact]
-        public async Task ShouldAwaitResourceToLoad()
+        public async Task ShouldAwaitResourcesToLoad()
         {
             var imgPath = "/img.png";
             var imgResponse = new TaskCompletionSource<bool>();
@@ -60,5 +60,14 @@ public async Task ShouldAwaitResourceToLoad()
             imgResponse.SetResult(true);
             await contentTask;
         }
+
+        [Fact]
+        public async Task ShouldWorkFastEnough()
+        {
+            for (var i = 0; i < 20; ++i)
+            {
+                await Page.SetContentAsync("<div>yo</div>");
+            }
+        }
     }
 }

lib/PuppeteerSharp/Frame.cs

@@ -564,7 +564,6 @@ public async Task SetContentAsync(string html, NavigationOptions options = null)
         {
             var waitUntil = options?.WaitUntil ?? new[] { WaitUntilNavigation.Load };
             var timeout = options?.Timeout ?? Puppeteer.DefaultTimeout;
-            var watcher = new LifecycleWatcher(FrameManager, this, waitUntil, timeout);
 
             // We rely upon the fact that document.open() will reset frame lifecycle with "init"
             // lifecycle event. @see https://crrev.com/608658
@@ -574,6 +573,8 @@ await EvaluateFunctionAsync(@"html => {
                 document.close();
             }", html);
 
+            var watcher = new LifecycleWatcher(FrameManager, this, waitUntil, timeout);
+
             var watcherTask = await Task.WhenAny(
                 watcher.TimeoutOrTerminationTask,
                 watcher.LifecycleTask).ConfigureAwait(false);

lib/PuppeteerSharp/LifecycleWatcher.cs

@@ -56,11 +56,13 @@ public LifecycleWatcher(
             _lifecycleTaskWrapper = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             _terminationTaskWrapper = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
-            frameManager.LifecycleEvent += CheckLifecycleComplete;
+            frameManager.LifecycleEvent += FrameManager_LifecycleEvent;
             frameManager.FrameNavigatedWithinDocument += NavigatedWithinDocument;
             frameManager.FrameDetached += OnFrameDetached;
             frameManager.NetworkManager.Request += OnRequest;
             frameManager.Client.Disconnected += OnClientDisconnected;
+
+            CheckLifecycleComplete();
         }
 
         #region Properties
@@ -77,7 +79,9 @@ public Task TimeoutOrTerminationTask
         #region Private methods
 
         private void OnClientDisconnected(object sender, EventArgs e)
-            => Terminate(new TargetClosedException("Navigation failed because browser has disconnected!", _frameManager.Client.CloseReason));
+            => Terminate(new TargetClosedException("Navigation failed because browser has disconnected!", _frameManager.Client.CloseReason));
+
+        void FrameManager_LifecycleEvent(object sender, FrameEventArgs e) => CheckLifecycleComplete();
 
         private void OnFrameDetached(object sender, FrameEventArgs e)
         {
@@ -87,10 +91,10 @@ private void OnFrameDetached(object sender, FrameEventArgs e)
                 Terminate(new PuppeteerException("Navigating frame was detached"));
                 return;
             }
-            CheckLifecycleComplete(sender, e);
+            CheckLifecycleComplete();
         }
 
-        private void CheckLifecycleComplete(object sender, FrameEventArgs e)
+        private void CheckLifecycleComplete()
         {
             // We expect navigation to commit.
             if (!CheckLifecycle(_frame, _expectedLifecycle))
@@ -131,7 +135,7 @@ private void NavigatedWithinDocument(object sender, FrameEventArgs e)
                 return;
             }
             _hasSameDocumentNavigation = true;
-            CheckLifecycleComplete(sender, e);
+            CheckLifecycleComplete();
         }
 
         private bool CheckLifecycle(Frame frame, IEnumerable<string> expectedLifecycle)
@@ -159,7 +163,7 @@ private bool CheckLifecycle(Frame frame, IEnumerable<string> expectedLifecycle)
 
         public void Dispose(bool disposing)
         {
-            _frameManager.LifecycleEvent -= CheckLifecycleComplete;
+            _frameManager.LifecycleEvent -= FrameManager_LifecycleEvent;
             _frameManager.FrameNavigatedWithinDocument -= NavigatedWithinDocument;
             _frameManager.FrameDetached -= OnFrameDetached;
             _frameManager.NetworkManager.Request -= OnRequest;