Skip to content

Commit 19c75cd

Browse files
authored
Separate target init from construction (#2320)
1 parent 54ac49c commit 19c75cd

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

lib/PuppeteerSharp/ChromeTargetManager.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ private void OnTargetCreated(TargetCreatedResponse e)
199199
}
200200

201201
var target = _targetFactoryFunc(e.TargetInfo, null);
202+
target.Initialize();
202203
_attachedTargetsByTargetId.AddItem(e.TargetInfo.TargetId, target);
203204
}
204205
}
@@ -288,6 +289,7 @@ await parent.SendAsync(
288289
}
289290

290291
var workerTarget = _targetFactoryFunc(targetInfo, null);
292+
workerTarget.Initialize();
291293
_attachedTargetsByTargetId.AddItem(targetInfo.TargetId, workerTarget);
292294
TargetAvailable?.Invoke(this, new TargetChangedArgs { Target = workerTarget });
293295
return;
@@ -316,6 +318,8 @@ await parent.SendAsync(
316318
}
317319
else
318320
{
321+
target.Initialize();
322+
319323
_attachedTargetsByTargetId.AddItem(targetInfo.TargetId, target);
320324
_attachedTargetsBySessionId.TryAdd(session.Id, target);
321325
}

lib/PuppeteerSharp/FirefoxTargetManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ private void OnTargetCreated(TargetCreatedResponse e)
117117
if (e.TargetInfo.Type == TargetType.Browser && e.TargetInfo.Attached)
118118
{
119119
var browserTarget = _targetFactoryFunc(e.TargetInfo, null);
120+
browserTarget.Initialize();
120121
_availableTargetsByTargetId.AddItem(e.TargetInfo.TargetId, browserTarget);
121122
FinishInitializationIfReady(e.TargetInfo.TargetId);
122123
}
@@ -129,6 +130,7 @@ private void OnTargetCreated(TargetCreatedResponse e)
129130
return;
130131
}
131132

133+
target.Initialize();
132134
_availableTargetsByTargetId.AddItem(e.TargetInfo.TargetId, target);
133135
TargetAvailable?.Invoke(
134136
this,

lib/PuppeteerSharp/PageTarget.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public override async Task<IPage> PageAsync()
3939
return await PageTask.ConfigureAwait(false);
4040
}
4141

42-
protected override void Initialize()
42+
internal override void Initialize()
4343
{
4444
_ = InitializedTaskWrapper.Task.ContinueWith(
4545
async initializedTask =>

lib/PuppeteerSharp/Target.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ internal void TargetInfoChanged(TargetInfo targetInfo)
8585
/// <summary>
8686
/// Initializes the target.
8787
/// </summary>
88-
protected virtual void Initialize()
88+
internal virtual void Initialize()
8989
{
9090
IsInitialized = true;
9191
InitializedTaskWrapper.TrySetResult(InitializationStatus.Success);

0 commit comments

Comments
 (0)