Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into thays_implement_method_calls_watch
  • Loading branch information
thaystg authored Jul 14, 2021
commit 044bbf9753ca9be40e4c531193fa1b5b6f03f9db
4 changes: 3 additions & 1 deletion src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,9 @@ private async Task<DebugStore> RuntimeReady(SessionId sessionId, CancellationTok
await SdbHelper.EnableExceptions(sessionId, "uncaught", token);

await SdbHelper.SetProtocolVersion(sessionId, token);
await SdbHelper.EnableReceiveUserBreakRequest(sessionId, token);
await SdbHelper.EnableReceiveRequests(sessionId, EventKind.UserBreak, token);
await SdbHelper.EnableReceiveRequests(sessionId, EventKind.EnC, token);
await SdbHelper.EnableReceiveRequests(sessionId, EventKind.MethodUpdate, token);

DebugStore store = await LoadStore(sessionId, token);

Expand Down
8 changes: 4 additions & 4 deletions src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -638,13 +638,13 @@ public async Task<bool> SetProtocolVersion(SessionId sessionId, CancellationToke
return true;
}

public async Task<bool> EnableReceiveRequests(SessionId sessionId, EventKind event_kind, CancellationToken token)
public async Task<bool> EnableReceiveRequests(SessionId sessionId, EventKind eventKind, CancellationToken token)
{
var commandParams = new MemoryStream();
var commandParamsWriter = new MonoBinaryWriter(commandParams);
commandParamsWriter.Write((byte)EventKind.UserBreak);
commandParamsWriter.Write((byte)SuspendPolicy.None);
commandParamsWriter.Write((byte)0);
command_params_writer.Write((byte)eventKind);
command_params_writer.Write((byte)SuspendPolicy.None);
command_params_writer.Write((byte)0);
var retDebuggerCmdReader = await SendDebuggerAgentCommand<CmdEventRequest>(sessionId, CmdEventRequest.Set, commandParams, token);
return true;
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.