From 6f50aa1c3554111acfdd5532ce38a2ebf54f6dee Mon Sep 17 00:00:00 2001 From: Pedro Pontes Date: Wed, 23 Jun 2021 08:07:49 +0200 Subject: [PATCH] chore: cherry-pick b77b38a3380c from chromium (#29823) * chore: cherry-pick b77b38a3380c from chromium * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Electron Bot --- patches/chromium/.patches | 1 + .../chromium/cherry-pick-b77b38a3380c.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 patches/chromium/cherry-pick-b77b38a3380c.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index b4c31fb883ad0..a738638395442 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -171,5 +171,6 @@ x11_fix_window_enumeration_order_when_wm_doesn_t_set.patch cherry-pick-0e36d324d6ef.patch m86-lts_longtaskdetector_remove_container_mutation_during.patch m86-lts_reduce_memory_consumption_on.patch +cherry-pick-b77b38a3380c.patch cherry-pick-d9556a80a790.patch cherry-pick-910e9e40d376.patch diff --git a/patches/chromium/cherry-pick-b77b38a3380c.patch b/patches/chromium/cherry-pick-b77b38a3380c.patch new file mode 100644 index 0000000000000..ba445dab6a2b8 --- /dev/null +++ b/patches/chromium/cherry-pick-b77b38a3380c.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Brandon Jones +Date: Wed, 16 Jun 2021 21:47:09 +0000 +Subject: Ensure that XRLayer includes base EventTarget in Trace + +Trace was skipping a level in the class hierarchy and calling +ScriptWrappable::Trace() instead. This was likely the result of the +class inheritance changing in the spec a while back and getting updated +elsewhere but not here, since it didn't raise any warnings. + +(cherry picked from commit 01b6f7e0a70648d7c7302454993f0bf86d5a0241) + +Bug: 1219857 +Change-Id: I4ac9f7b037ac5e5dd0e6d670f1d5a30e6344862f +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2964533 +Commit-Queue: Brandon Jones +Reviewed-by: Alexander Cooper +Cr-Original-Commit-Position: refs/heads/master@{#892650} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2967199 +Auto-Submit: Brandon Jones +Commit-Queue: Rubber Stamper +Bot-Commit: Rubber Stamper +Cr-Commit-Position: refs/branch-heads/4472@{#1492} +Cr-Branched-From: 3d60439cfb36485e76a1c5bb7f513d3721b20da1-refs/heads/master@{#870763} + +diff --git a/third_party/blink/renderer/modules/xr/xr_layer.cc b/third_party/blink/renderer/modules/xr/xr_layer.cc +index eaa8603c7354a5c8e71e9a2e6161824063804fb6..aa30a4cec88fa11b342695dc675ab572320e9166 100644 +--- a/third_party/blink/renderer/modules/xr/xr_layer.cc ++++ b/third_party/blink/renderer/modules/xr/xr_layer.cc +@@ -21,7 +21,7 @@ const AtomicString& XRLayer::InterfaceName() const { + + void XRLayer::Trace(Visitor* visitor) const { + visitor->Trace(session_); +- ScriptWrappable::Trace(visitor); ++ EventTargetWithInlineData::Trace(visitor); + } + + } // namespace blink