@@ -13,8 +13,8 @@ public class Target
1313 {
1414 #region Private members
1515 private TargetInfo _targetInfo ;
16- private readonly string _targetId ;
1716 private readonly Func < TargetInfo , Task < CDPSession > > _sessionFactory ;
17+ private readonly TaskCompletionSource < bool > _initializedTaskWrapper = new TaskCompletionSource < bool > ( TaskCreationOptions . RunContinuationsAsynchronously ) ;
1818 #endregion
1919
2020 internal bool IsInitialized ;
@@ -25,24 +25,24 @@ internal Target(
2525 BrowserContext browserContext )
2626 {
2727 _targetInfo = targetInfo ;
28- _targetId = targetInfo . TargetId ;
2928 _sessionFactory = sessionFactory ;
3029 BrowserContext = browserContext ;
3130 PageTask = null ;
3231
33- InitilizedTaskWrapper = new TaskCompletionSource < bool > ( TaskCreationOptions . RunContinuationsAsynchronously ) ;
34- InitilizedTaskWrapper . Task . ContinueWith ( async initializedTask =>
32+ _ = _initializedTaskWrapper . Task . ContinueWith ( async initializedTask =>
3533 {
3634 var success = initializedTask . Result ;
3735 if ( ! success )
3836 {
3937 return ;
4038 }
41- if ( Opener == null || Opener . PageTask == null || Type != TargetType . Page )
39+
40+ var openerPageTask = Opener ? . PageTask ;
41+ if ( openerPageTask == null || Type != TargetType . Page )
4242 {
4343 return ;
4444 }
45- var openerPage = await Opener . PageTask . ConfigureAwait ( false ) ;
45+ var openerPage = await openerPageTask . ConfigureAwait ( false ) ;
4646 if ( ! openerPage . HasPopupEventListeners )
4747 {
4848 return ;
@@ -56,7 +56,7 @@ internal Target(
5656
5757 if ( IsInitialized )
5858 {
59- InitilizedTaskWrapper . TrySetResult ( true ) ;
59+ _initializedTaskWrapper . TrySetResult ( true ) ;
6060 }
6161 }
6262
@@ -97,8 +97,7 @@ internal Target(
9797 /// </summary>
9898 public BrowserContext BrowserContext { get ; }
9999
100- internal Task < bool > InitializedTask => InitilizedTaskWrapper . Task ;
101- internal TaskCompletionSource < bool > InitilizedTaskWrapper { get ; }
100+ internal Task < bool > InitializedTask => _initializedTaskWrapper . Task ;
102101 internal Task CloseTask => CloseTaskWrapper . Task ;
103102 internal TaskCompletionSource < bool > CloseTaskWrapper { get ; }
104103 internal Task < Page > PageTask { get ; set ; }
@@ -132,7 +131,7 @@ internal void TargetInfoChanged(TargetInfo targetInfo)
132131 if ( ! IsInitialized && ( _targetInfo . Type != TargetType . Page || _targetInfo . Url != string . Empty ) )
133132 {
134133 IsInitialized = true ;
135- InitilizedTaskWrapper . TrySetResult ( true ) ;
134+ _initializedTaskWrapper . TrySetResult ( true ) ;
136135 return ;
137136 }
138137
0 commit comments