Skip to content

Commit 0f73456

Browse files
authored
Roll Chromium to r686378 (#1285)
1 parent 45c0926 commit 0f73456

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

lib/PuppeteerSharp.Tests/PageTests/AddScriptTagTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public async Task ShouldWorkWithContent()
106106
Assert.Equal(35, await Page.EvaluateExpressionAsync<int>("__injected"));
107107
}
108108

109-
[Fact]
109+
[Fact(Skip = "@see https://github.com/GoogleChrome/puppeteer/issues/4840")]
110110
public async Task ShouldThrowWhenAddedWithContentToTheCSPPage()
111111
{
112112
await Page.GoToAsync(TestConstants.ServerUrl + "/csp.html");

lib/PuppeteerSharp/BrowserFetcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class BrowserFetcher
3838
/// <summary>
3939
/// Default Chromium revision.
4040
/// </summary>
41-
public const int DefaultRevision = 682225;
41+
public const int DefaultRevision = 686378;
4242

4343
/// <summary>
4444
/// Gets the downloads folder.

lib/PuppeteerSharp/Target.cs

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ internal Target(
110110
/// <summary>
111111
/// Returns the <see cref="Page"/> associated with the target. If the target is not <c>"page"</c> or <c>"background_page"</c> returns <c>null</c>
112112
/// </summary>
113-
/// <returns>a task that returns a <see cref="Page"/></returns>
113+
/// <returns>a task that returns a <see cref="Page"/></returns>
114114
public Task<Page> PageAsync()
115115
{
116116
if ((TargetInfo.Type == TargetType.Page || TargetInfo.Type == TargetType.BackgroundPage) && PageTask == null)
@@ -142,28 +142,8 @@ public Task<Worker> WorkerAsync()
142142
private async Task<Worker> WorkerInternalAsync()
143143
{
144144
var client = await _sessionFactory().ConfigureAwait(false);
145-
var targetAttachedWrapper = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
146-
void MessageReceived(object sender, MessageEventArgs e)
147-
{
148-
if (e.MessageID == "Target.attachedToTarget")
149-
{
150-
targetAttachedWrapper.TrySetResult(e.MessageData.ToObject<TargetAttachedToTargetResponse>(true).SessionId);
151-
client.MessageReceived -= MessageReceived;
152-
}
153-
}
154-
client.MessageReceived += MessageReceived;
155-
156-
await Task.WhenAll(
157-
targetAttachedWrapper.Task,
158-
client.SendAsync("Target.setAutoAttach", new TargetSetAutoAttachRequest
159-
{
160-
AutoAttach = true,
161-
WaitForDebuggerOnStart = false,
162-
Flatten = true
163-
})).ConfigureAwait(false);
164-
var session = Connection.FromSession(client).GetSession(targetAttachedWrapper.Task.Result);
165145
return new Worker(
166-
session,
146+
client,
167147
TargetInfo.Url,
168148
(consoleType, handles, stackTrace) => Task.CompletedTask,
169149
(e) => { });

0 commit comments

Comments
 (0)