mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: overzealous media key listening on Windows (#34594)

Browse source
This commit is contained in:
Shelley Vohr 2022-06-20 12:40:10 +02:00 committed by GitHub
parent e2f42e5d99
commit 6e9466f96b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
View file

@ -59,10 +59,10 @@ index ad366d0fd4c3a637d75a102ab56984f0d01bfc04..d63eb133fd4bab1ea309bb8c742acf88
// true if register successfully, or false if 1) the specificied |accelerator| // true if register successfully, or false if 1) the specificied |accelerator|
// has been registered by another caller or other native applications, or // 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 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
index b954f8dde00d4f5257223c464e9145a6bef48900..b58999f295586a61bcc2648488a8b28f15d80a7e 100644 index b954f8dde00d4f5257223c464e9145a6bef48900..ee9da826014d3aae9675daac6cdbc0f447a14efd 100644
--- a/content/browser/media/media_keys_listener_manager_impl.cc --- a/content/browser/media/media_keys_listener_manager_impl.cc
+++ b/content/browser/media/media_keys_listener_manager_impl.cc +++ b/content/browser/media/media_keys_listener_manager_impl.cc
@@ -56,7 +56,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey( @@ -56,7 +56,11 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
CanActiveMediaSessionControllerReceiveEvents(); CanActiveMediaSessionControllerReceiveEvents();
// Tell the underlying MediaKeysListener to listen for the key. // Tell the underlying MediaKeysListener to listen for the key.
@ -71,12 +71,11 @@ index b954f8dde00d4f5257223c464e9145a6bef48900..b58999f295586a61bcc2648488a8b28f
+#if BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_MAC)
+ !media_key_handling_enabled_ && + !media_key_handling_enabled_ &&
+#endif // BUILDFLAG(IS_MAC) +#endif // BUILDFLAG(IS_MAC)
+ should_start_watching && + should_start_watching && media_keys_listener_ &&
+ media_keys_listener_ &&
!media_keys_listener_->StartWatchingMediaKey(key_code)) { !media_keys_listener_->StartWatchingMediaKey(key_code)) {
return false; return false;
} }
@@ -239,18 +244,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() { @@ -239,6 +243,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
#endif #endif
if (system_media_controls_) { if (system_media_controls_) {
@ -84,19 +83,22 @@ index b954f8dde00d4f5257223c464e9145a6bef48900..b58999f295586a61bcc2648488a8b28f
system_media_controls_->AddObserver(this); system_media_controls_->AddObserver(this);
system_media_controls_notifier_ = system_media_controls_notifier_ =
std::make_unique<SystemMediaControlsNotifier>( std::make_unique<SystemMediaControlsNotifier>(
system_media_controls_.get()); @@ -251,6 +256,19 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
- } else { DCHECK(media_keys_listener_);
- // 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_);
} }
+ // Directly listen for media key keypresses when using GlobalShortcuts. +#if BUILDFLAG(IS_MAC)
+ // Chromium's implementation of SystemMediaControls falls
+ // down into MPRemoteCommandCenter, which makes it such that an app will not
+ // will not receive remote control events until it begins playing audio.
+ // If there's not already a MediaKeysListener instance, create one so
+ // that globalShortcuts work correctly.
+ if (!media_keys_listener_) {
+ media_keys_listener_ = ui::MediaKeysListener::Create( + media_keys_listener_ = ui::MediaKeysListener::Create(
+ this, ui::MediaKeysListener::Scope::kGlobal); + this, ui::MediaKeysListener::Scope::kGlobal);
+ DCHECK(media_keys_listener_); + DCHECK(media_keys_listener_);
+ }
+#endif
+ +
EnsureAuxiliaryServices(); EnsureAuxiliaryServices();
} }