Improve SetContentAsync and LifecycleWatcher (#836)

hardkoded · Jan 5, 2019 · aff3de2 · aff3de2
1 parent d61fe13
commit aff3de2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/lib/PuppeteerSharp/Frame.cs b/lib/PuppeteerSharp/Frame.cs
@@ -566,13 +566,13 @@ await EvaluateFunctionAsync(@"html => {
                 document.close();
             }", html);
 
-            var watcher = new LifecycleWatcher(FrameManager, this, timeout, options);
+            var watcher = new LifecycleWatcher(FrameManager, this, waitUntil, timeout);
 
             var watcherTask = await Task.WhenAny(
                 watcher.TimeoutOrTerminationTask,
                 watcher.LifecycleTask).ConfigureAwait(false);
 
-            await watcherTask;
+            await watcherTask.ConfigureAwait(false);
         }
 
         /// <summary>

diff --git a/lib/PuppeteerSharp/FrameManager.cs b/lib/PuppeteerSharp/FrameManager.cs
@@ -74,7 +74,8 @@ public async Task<Response> NavigateFrameAsync(Frame frame, string url, Navigati
                : options.Referer;
             var requests = new Dictionary<string, Request>();
             var timeout = options?.Timeout ?? DefaultNavigationTimeout;
-            using (var watcher = new LifecycleWatcher(this, frame, timeout, options))
+
+            using (var watcher = new LifecycleWatcher(this, frame, options?.WaitUntil, timeout))
             {
                 try
                 {
@@ -121,7 +122,7 @@ private async Task NavigateAsync(CDPSession client, string url, string referrer,
         public async Task<Response> WaitForFrameNavigationAsync(Frame frame, NavigationOptions options = null)
         {
             var timeout = options?.Timeout ?? DefaultNavigationTimeout;
-            using (var watcher = new LifecycleWatcher(this, frame, timeout, options))
+            using (var watcher = new LifecycleWatcher(this, frame, options?.WaitUntil, timeout))
             {
                 var raceTask = await Task.WhenAny(
                     watcher.NewDocumentNavigationTask,

diff --git a/lib/PuppeteerSharp/LifecycleWatcher.cs b/lib/PuppeteerSharp/LifecycleWatcher.cs
@@ -22,7 +22,6 @@ internal class LifecycleWatcher : IDisposable
 
         private readonly FrameManager _frameManager;
         private readonly Frame _frame;
-        private readonly NavigationOptions _options;
         private readonly IEnumerable<string> _expectedLifecycle;
         private readonly int _timeout;
         private readonly string _initialLoaderId;
@@ -36,17 +35,10 @@ internal class LifecycleWatcher : IDisposable
         public LifecycleWatcher(
             FrameManager frameManager,
             Frame frame,
-            int timeout,
-            NavigationOptions options)
+            WaitUntilNavigation[] waitUntil,
+            int timeout)
         {
-            var waitUntil = _defaultWaitUntil;
-
-            if (options?.WaitUntil != null)
-            {
-                waitUntil = options.WaitUntil;
-            }
-
-            _expectedLifecycle = waitUntil.Select(w =>
+            _expectedLifecycle = (waitUntil ?? _defaultWaitUntil).Select(w =>
             {
                 var protocolEvent = _puppeteerToProtocolLifecycle.GetValueOrDefault(w);
                 Contract.Assert(protocolEvent != null, $"Unknown value for options.waitUntil: {w}");
@@ -55,7 +47,6 @@ public LifecycleWatcher(
 
             _frameManager = frameManager;
             _frame = frame;
-            _options = options;
             _initialLoaderId = frame.LoaderId;
             _timeout = timeout;
             _hasSameDocumentNavigation = false;