chore: cherry-pick 3030db702eee from chromium (#22987)

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Jeremy Apthorp
2020-04-09 08:40:40 -07:00
committed by GitHub
parent fb9b281515
commit 61d0fa5147
2 changed files with 30 additions and 0 deletions

View File

@@ -100,6 +100,7 @@ fix_hi-dpi_transitions_on_catalina.patch
allow_restricted_clock_nanosleep_in_linux_sandbox.patch
move_readablestream_requests_onto_the_stack_before_iteration.patch
streams_convert_state_dchecks_to_checks.patch
cherry-pick-3030db702eee.patch
audiocontext_haspendingactivity_unless_it_s_closed.patch
protect_automatic_pull_handlers_with_mutex.patch
reland_sequentialise_access_to_callbacks_in.patch

View File

@@ -0,0 +1,29 @@
From 3030db702eee4f24e74e84b66024bd0875fd5418 Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@chromium.org>
Date: Tue, 10 Mar 2020 06:04:07 +0000
Subject: [PATCH] [Merge M81] - Point usrsctp to
a68325e7d9ed844cc84ec134192d788586ea6cc1.
Bug: 1059349
Change-Id: I451873d552b6fe0ca6cd481385042bf37a05fbfd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093604
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/branch-heads/4044@{#735}
Cr-Branched-From: a6d9daf149a473ceea37f629c41d4527bf2055bd-refs/heads/master@{#737173}
---
DEPS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/DEPS b/DEPS
index a95e9b828dda0..e86ca48012b57 100644
--- a/DEPS
+++ b/DEPS
@@ -1463,7 +1463,7 @@ deps = {
},
'src/third_party/usrsctp/usrsctplib':
- Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '7a8bc9a90ca96634aa56ee712856d97f27d903f8',
+ Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'a68325e7d9ed844cc84ec134192d788586ea6cc1',
# Display server protocol for Linux.
'src/third_party/wayland/src': {