From 62a185b67267fa14b96daa199e96405738385dad Mon Sep 17 00:00:00 2001 From: Micha Hanselmann Date: Mon, 29 Nov 2021 16:54:20 +0100 Subject: [PATCH 1/3] fix: win7 crash when playing media --- ...media_key_usage_with_globalshortcuts.patch | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch index 92e96b43b0625..354205b9bb88c 100644 --- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch +++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch @@ -59,7 +59,7 @@ index 9aec54a3263d24491d24013a80b719dfc834ecd4..001a6cb2a5eb701351fa924109b43fab // true if register successfully, or false if 1) the specificied |accelerator| // has been registered by another caller or other native applications, or diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc -index 5938f75742b793868638e693a9a8c8dc686dfc46..1137ea6c6b2b14f912b400e3cc43dc6fd0243407 100644 +index 5938f75742b793868638e693a9a8c8dc686dfc46..fdf8dd6a0f4a63badf3aa55181835adc22e4d988 100644 --- a/content/browser/media/media_keys_listener_manager_impl.cc +++ b/content/browser/media/media_keys_listener_manager_impl.cc @@ -55,7 +55,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey( @@ -76,32 +76,29 @@ index 5938f75742b793868638e693a9a8c8dc686dfc46..1137ea6c6b2b14f912b400e3cc43dc6f !media_keys_listener_->StartWatchingMediaKey(key_code)) { return false; } -@@ -231,18 +236,16 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() { +@@ -231,19 +236,19 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() { media::AudioManager::GetGlobalAppName()); #endif -- if (system_media_controls_) { -- system_media_controls_->AddObserver(this); -- system_media_controls_notifier_ = -- std::make_unique( -- system_media_controls_.get()); ++ // This is required for proper functioning of MediaMetadata. + if (system_media_controls_) { + system_media_controls_->AddObserver(this); + system_media_controls_notifier_ = + std::make_unique( + system_media_controls_.get()); - } else { - // If we can't access system media controls, then directly listen for media - // key keypresses instead. - media_keys_listener_ = ui::MediaKeysListener::Create( - this, ui::MediaKeysListener::Scope::kGlobal); - DCHECK(media_keys_listener_); -- } -+ // This is required for proper functioning of MediaMetadata. -+ system_media_controls_->AddObserver(this); -+ system_media_controls_notifier_ = -+ std::make_unique( -+ system_media_controls_.get()); -+ + } + + // Directly listen for media key keypresses when using GlobalShortcuts. + media_keys_listener_ = ui::MediaKeysListener::Create( + this, ui::MediaKeysListener::Scope::kGlobal); + DCHECK(media_keys_listener_); - ++ EnsureAuxiliaryServices(); } + From b9ddccb6eb5308fbfcdcd5d115d29f42c8a4499e Mon Sep 17 00:00:00 2001 From: Micha Hanselmann Date: Tue, 30 Nov 2021 10:59:55 +0100 Subject: [PATCH 2/3] reset --- .../fix_media_key_usage_with_globalshortcuts.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch index 354205b9bb88c..8ab2f877df249 100644 --- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch +++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch @@ -59,7 +59,7 @@ index 9aec54a3263d24491d24013a80b719dfc834ecd4..001a6cb2a5eb701351fa924109b43fab // true if register successfully, or false if 1) the specificied |accelerator| // has been registered by another caller or other native applications, or diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc -index 5938f75742b793868638e693a9a8c8dc686dfc46..fdf8dd6a0f4a63badf3aa55181835adc22e4d988 100644 +index 5938f75742b793868638e693a9a8c8dc686dfc46..7f30f3fdd2c63612232e31c331b26b17ad729efb 100644 --- a/content/browser/media/media_keys_listener_manager_impl.cc +++ b/content/browser/media/media_keys_listener_manager_impl.cc @@ -55,7 +55,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey( @@ -76,12 +76,11 @@ index 5938f75742b793868638e693a9a8c8dc686dfc46..fdf8dd6a0f4a63badf3aa55181835adc !media_keys_listener_->StartWatchingMediaKey(key_code)) { return false; } -@@ -231,19 +236,19 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() { - media::AudioManager::GetGlobalAppName()); +@@ -232,18 +237,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() { #endif -+ // This is required for proper functioning of MediaMetadata. if (system_media_controls_) { ++ // This is required for proper functioning of MediaMetadata. system_media_controls_->AddObserver(this); system_media_controls_notifier_ = std::make_unique( @@ -93,7 +92,7 @@ index 5938f75742b793868638e693a9a8c8dc686dfc46..fdf8dd6a0f4a63badf3aa55181835adc - this, ui::MediaKeysListener::Scope::kGlobal); - DCHECK(media_keys_listener_); } - + + // Directly listen for media key keypresses when using GlobalShortcuts. + media_keys_listener_ = ui::MediaKeysListener::Create( + this, ui::MediaKeysListener::Scope::kGlobal); From a07512736b96a98139e632d9a13bb7d337a90da8 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:10:52 +0000 Subject: [PATCH 3/3] chore: update patches --- patches/chromium/fix_media_key_usage_with_globalshortcuts.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch index 8ab2f877df249..4249a08bf26e9 100644 --- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch +++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch @@ -92,7 +92,7 @@ index 5938f75742b793868638e693a9a8c8dc686dfc46..7f30f3fdd2c63612232e31c331b26b17 - this, ui::MediaKeysListener::Scope::kGlobal); - DCHECK(media_keys_listener_); } - + + // Directly listen for media key keypresses when using GlobalShortcuts. + media_keys_listener_ = ui::MediaKeysListener::Create( + this, ui::MediaKeysListener::Scope::kGlobal);