From d1b3bc9afb97f8126295a88744fb67761b4908d7 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Mon, 6 Apr 2020 14:35:14 -0700 Subject: [PATCH 1/2] chore: cherry-pick 3030db702eee from chromium --- patches/chromium/.patches | 1 + .../chromium/cherry-pick-3030db702eee.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 patches/chromium/cherry-pick-3030db702eee.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 8e24deeaef336..3f4121b2b0bb3 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -100,3 +100,4 @@ move_readablestream_requests_onto_the_stack_before_iteration.patch streams_convert_state_dchecks_to_checks.patch cherry-pick-fd211b44535c.patch cherry-pick-db71a0afc1d0.patch +cherry-pick-3030db702eee.patch diff --git a/patches/chromium/cherry-pick-3030db702eee.patch b/patches/chromium/cherry-pick-3030db702eee.patch new file mode 100644 index 0000000000000..cc7b7ced90963 --- /dev/null +++ b/patches/chromium/cherry-pick-3030db702eee.patch @@ -0,0 +1,29 @@ +From 3030db702eee4f24e74e84b66024bd0875fd5418 Mon Sep 17 00:00:00 2001 +From: Mirko Bonadei +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 +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': { From 8edcce16c9cb0ee4bc1e7e582b28b8c367c7a214 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 9 Apr 2020 17:16:00 +0000 Subject: [PATCH 2/2] update patches --- ...o_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch} | 12 ++++-------- patches/chromium/.patches | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) rename patches/chromium/{cherry-pick-3030db702eee.patch => -_point_usrsctp_to_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch} (74%) diff --git a/patches/chromium/cherry-pick-3030db702eee.patch b/patches/chromium/-_point_usrsctp_to_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch similarity index 74% rename from patches/chromium/cherry-pick-3030db702eee.patch rename to patches/chromium/-_point_usrsctp_to_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch index cc7b7ced90963..a5e837f0bb6c0 100644 --- a/patches/chromium/cherry-pick-3030db702eee.patch +++ b/patches/chromium/-_point_usrsctp_to_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch @@ -1,8 +1,7 @@ -From 3030db702eee4f24e74e84b66024bd0875fd5418 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 10 Mar 2020 06:04:07 +0000 -Subject: [PATCH] [Merge M81] - Point usrsctp to - a68325e7d9ed844cc84ec134192d788586ea6cc1. +Subject: - Point usrsctp to a68325e7d9ed844cc84ec134192d788586ea6cc1. Bug: 1059349 Change-Id: I451873d552b6fe0ca6cd481385042bf37a05fbfd @@ -10,15 +9,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093604 Reviewed-by: Guido Urdaneta 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 +index 4efda890e2a2b9e4597a03a435a5fc0b716f6564..6a46b05c750c82fc43fe118b2493c78518f271a9 100644 --- a/DEPS +++ b/DEPS -@@ -1463,7 +1463,7 @@ deps = { +@@ -1388,7 +1388,7 @@ deps = { }, 'src/third_party/usrsctp/usrsctplib': diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 62d2acdec55cc..83e770b47a3e4 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -98,7 +98,7 @@ typemap.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 +-_point_usrsctp_to_a68325e7d9ed844cc84ec134192d788586ea6cc1.patch audiocontext_haspendingactivity_unless_it_s_closed.patch protect_automatic_pull_handlers_with_mutex.patch reland_sequentialise_access_to_callbacks_in.patch