Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 49078100f4
Branches Tags
electron
/
patches
/
chromium
/
fix_media_key_usage_with_globalshortcuts.patch

fix_media_key_usage_with_globalshortcuts.patch 4.5 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Mon, 16 Aug 2021 17:55:32 +0200
    4. 

  4. Subject: fix: media key usage with globalShortcuts
    5. 

  5. 

  6. This patch enables media keys to work properly with Electron's globalShortcut
    7. 

  7. module. Chromium's default usage of RemoteCommandCenterDelegate on macOS falls
    8. 

  8. down into MPRemoteCommandCenter, which makes it such that an app will not
    9. 

  9. receive remote control events until it begins playing audio. This runs
    10. 

  10. counter to the design of globalShortcuts, and so we need to instead
    11. 

  11. use `ui::MediaKeysListener`.
    12. 

  12. 

  13. diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
    14. 

  14. index 42e37564e585987d367921568f0f1d2b7507f953..9baf89efbade01e8b60c579255f10799914e144f 100644
    15. 

  15. --- a/content/browser/media/media_keys_listener_manager_impl.cc
    16. 

  16. +++ b/content/browser/media/media_keys_listener_manager_impl.cc
    17. 

  17. @@ -87,7 +87,11 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
    18. 

  18.        CanActiveMediaSessionControllerReceiveEvents();
    19. 

  19.  
    20. 

  20.    // Tell the underlying MediaKeysListener to listen for the key.
    21. 

  21. -  if (should_start_watching && media_keys_listener_ &&
    22. 

  22. +  if (
    23. 

  23. +#if BUILDFLAG(IS_MAC)
    24. 

  24. +      !media_key_handling_enabled_ &&
    25. 

  25. +#endif  // BUILDFLAG(IS_MAC)
    26. 

  26. +      should_start_watching && media_keys_listener_ &&
    27. 

  27.        !media_keys_listener_->StartWatchingMediaKey(key_code)) {
    28. 

  28.      return false;
    29. 

  29.    }
    30. 

  30. @@ -361,6 +365,20 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
    31. 

  31.          this, ui::MediaKeysListener::Scope::kGlobal);
    32. 

  32.      DCHECK(media_keys_listener_);
    33. 

  33.    }
    34. 

  34. +
    35. 

  35. +#if BUILDFLAG(IS_MAC)
    36. 

  36. +  // Chromium's implementation of SystemMediaControls falls
    37. 

  37. +  // down into MPRemoteCommandCenter, which makes it such that an app will not
    38. 

  38. +  // will not receive remote control events until it begins playing audio.
    39. 

  39. +  // If there's not already a MediaKeysListener instance, create one so
    40. 

  40. +  // that globalShortcuts work correctly.
    41. 

  41. +  if (!media_keys_listener_) {
    42. 

  42. +    media_keys_listener_ = ui::MediaKeysListener::Create(
    43. 

  43. +        this, ui::MediaKeysListener::Scope::kGlobal);
    44. 

  44. +    DCHECK(media_keys_listener_);
    45. 

  45. +  }
    46. 

  46. +#endif
    47. 

  47. +
    48. 

  48.    EnsureAuxiliaryServices();
    49. 

  49.  }
    50. 

  50.  
    51. 

  51. diff --git a/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.cc b/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.cc
    52. 

  52. index cdf35a5bcec7b30f1b75e77cc29a9b7bb591cfd6..b6dfeee587faa742beb4f1d871db4c4f76bf46ab 100644
    53. 

  53. --- a/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.cc
    54. 

  54. +++ b/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.cc
    55. 

  55. @@ -65,6 +65,22 @@ void GlobalAcceleratorListener::UnregisterAccelerator(
    56. 

  56.    }
    57. 

  57.  }
    58. 

  58.  
    59. 

  59. +// static
    60. 

  60. +void GlobalAcceleratorListener::SetShouldUseInternalMediaKeyHandling(bool should_use) {
    61. 

  61. +  if (content::MediaKeysListenerManager::
    62. 

  62. +            IsMediaKeysListenerManagerEnabled()) {
    63. 

  63. +    content::MediaKeysListenerManager* media_keys_listener_manager =
    64. 

  64. +        content::MediaKeysListenerManager::GetInstance();
    65. 

  65. +    DCHECK(media_keys_listener_manager);
    66. 

  66. +
    67. 

  67. +    if (should_use) {
    68. 

  68. +      media_keys_listener_manager->EnableInternalMediaKeyHandling();
    69. 

  69. +    } else {
    70. 

  70. +      media_keys_listener_manager->DisableInternalMediaKeyHandling();
    71. 

  71. +    }
    72. 

  72. +  }
    73. 

  73. +}
    74. 

  74. +
    75. 

  75.  void GlobalAcceleratorListener::UnregisterAccelerators(Observer* observer) {
    76. 

  76.    if (IsShortcutHandlingSuspended()) {
    77. 

  77.      return;
    78. 

  78. diff --git a/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.h b/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.h
    79. 

  79. index 701808699796b0ef1a87d4d12f79fb6cf580c617..bf6e38410cedd6dd6d339b6f2f456124770bbd96 100644
    80. 

  80. --- a/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.h
    81. 

  81. +++ b/ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.h
    82. 

  82. @@ -8,6 +8,7 @@
    83. 

  83.  #include <map>
    84. 

  84.  
    85. 

  85.  #include "base/memory/raw_ptr.h"
    86. 

  86. +#include "content/public/browser/media_keys_listener_manager.h"
    87. 

  87.  #include "ui/base/accelerators/command.h"
    88. 

  88.  
    89. 

  89.  namespace ui {
    90. 

  90. @@ -38,6 +39,9 @@ class GlobalAcceleratorListener {
    91. 

  91.    // The instance may be nullptr.
    92. 

  92.    static GlobalAcceleratorListener* GetInstance();
    93. 

  93.  
    94. 

  94. +  // enables media keys to work with Electron's globalShortcut module.
    95. 

  95. +  static void SetShouldUseInternalMediaKeyHandling(bool should_use);
    96. 

  96. +
    97. 

  97.    // Register an observer for when a certain `accelerator` is struck. Returns
    98. 

  98.    // true if register successfully, or false if the specified `accelerator`
    99. 

  99.    // has been registered by another caller or other native applications.
    100.