Make AudioRendererSinkCache::FrameObserver a window supplement

It's effecitvely per-window as is, and the current design might have
problems in a case where the cache is used from multiple windows that
were associated with the same frame.

Change-Id: Idad13fa9ad91f77be3c0feae6370a0ea396db7c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2516975Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Nate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824512}

third_party/blink/renderer/modules/media/audio/audio_renderer_sink_cache.cc

@@ -29,48 +29,34 @@ namespace blink {
 
 AudioRendererSinkCache* AudioRendererSinkCache::instance_ = nullptr;
 
-class AudioRendererSinkCache::FrameObserver final
-    : public GarbageCollected<AudioRendererSinkCache::FrameObserver>,
-      public Supplement<LocalFrame>,
+class AudioRendererSinkCache::WindowObserver final
+    : public GarbageCollected<AudioRendererSinkCache::WindowObserver>,
+      public Supplement<LocalDOMWindow>,
       public ExecutionContextLifecycleObserver {
  public:
   static const char kSupplementName[];
-  static FrameObserver* From(LocalFrame& frame) {
-    return Supplement<LocalFrame>::From<FrameObserver>(frame);
-  }
 
-  explicit FrameObserver(LocalFrame& frame)
-      : Supplement<LocalFrame>(frame),
-        ExecutionContextLifecycleObserver(frame.DomWindow()) {}
-  ~FrameObserver() { DCHECK(dropped_frame_cached_); }
+  explicit WindowObserver(LocalDOMWindow& window)
+      : Supplement<LocalDOMWindow>(window),
+        ExecutionContextLifecycleObserver(&window) {}
+  ~WindowObserver() = default;
 
   void Trace(Visitor* visitor) const final {
-    Supplement<LocalFrame>::Trace(visitor);
+    Supplement<LocalDOMWindow>::Trace(visitor);
     ExecutionContextLifecycleObserver::Trace(visitor);
   }
 
   // ExecutionContextLifecycleObserver implementation.
-  void ContextDestroyed() override { DropFrameCache(); }
-
- private:
-  void DropFrameCache() {
-    dropped_frame_cached_ = true;
-
-    if (!AudioRendererSinkCache::instance_)
-      return;
-    if (!GetSupplementable())
-      return;
-
-    LocalFrameToken frame_token = GetSupplementable()->GetLocalFrameToken();
-    AudioRendererSinkCache::instance_->DropSinksForFrame(frame_token);
+  void ContextDestroyed() override {
+    if (auto* cache_instance = AudioRendererSinkCache::instance_)
+      cache_instance->DropSinksForFrame(DomWindow()->GetLocalFrameToken());
   }
 
-  bool dropped_frame_cached_ = false;
-  DISALLOW_COPY_AND_ASSIGN(FrameObserver);
+  DISALLOW_COPY_AND_ASSIGN(WindowObserver);
 };
 
-const char AudioRendererSinkCache::FrameObserver::kSupplementName[] =
-    "AudioRendererSinkCache::FrameObserver";
+const char AudioRendererSinkCache::WindowObserver::kSupplementName[] =
+    "AudioRendererSinkCache::WindowObserver";
 
 namespace {
 
@@ -105,12 +91,11 @@ struct AudioRendererSinkCache::CacheEntry {
 };
 
 // static
-void AudioRendererSinkCache::InstallFrameObserver(LocalFrame& frame) {
-  if (AudioRendererSinkCache::FrameObserver::From(frame))
+void AudioRendererSinkCache::InstallWindowObserver(LocalDOMWindow& window) {
+  if (Supplement<LocalDOMWindow>::From<WindowObserver>(window))
     return;
-  Supplement<LocalFrame>::ProvideTo(
-      frame,
-      MakeGarbageCollected<AudioRendererSinkCache::FrameObserver>(frame));
+  Supplement<LocalDOMWindow>::ProvideTo(
+      window, MakeGarbageCollected<WindowObserver>(window));
 }
 
 AudioRendererSinkCache::AudioRendererSinkCache(

third_party/blink/renderer/modules/media/audio/audio_renderer_sink_cache.h

@@ -26,7 +26,7 @@ class AudioRendererSink;
 
 namespace blink {
 
-class LocalFrame;
+class LocalDOMWindow;
 
 // Caches AudioRendererSink instances, provides them to the clients for usage,
 // tracks their used/unused state, reuses them to obtain output device
@@ -34,7 +34,7 @@ class LocalFrame;
 // Must live on the main render thread. Thread safe.
 class MODULES_EXPORT AudioRendererSinkCache {
  public:
-  class FrameObserver;
+  class WindowObserver;
 
   // Callback to be used for AudioRendererSink creation
   using CreateSinkCallback =
@@ -42,9 +42,9 @@ class MODULES_EXPORT AudioRendererSinkCache {
           const LocalFrameToken& frame_token,
           const media::AudioSinkParameters& params)>;
 
-  // If called, the cache will drop sinks belonging to the specified frame on
+  // If called, the cache will drop sinks belonging to the specified window on
   // navigation.
-  static void InstallFrameObserver(LocalFrame& frame);
+  static void InstallWindowObserver(LocalDOMWindow&);
 
   // |cleanup_task_runner| will be used to delete sinks when they are unused,
   // AudioRendererSinkCache must outlive any tasks posted to it. Since
@@ -67,7 +67,7 @@ class MODULES_EXPORT AudioRendererSinkCache {
  private:
   friend class AudioRendererSinkCacheTest;
   friend class CacheEntryFinder;
-  friend class AudioRendererSinkCache::FrameObserver;
+  friend class AudioRendererSinkCache::WindowObserver;
 
   struct CacheEntry;
   using CacheContainer = std::vector<CacheEntry>;

third_party/blink/renderer/modules/modules_initializer.cc

@@ -178,7 +178,7 @@ void ModulesInitializer::InstallSupplements(LocalFrame& frame) const {
   DCHECK(WebLocalFrameImpl::FromFrame(&frame)->Client());
   InspectorAccessibilityAgent::ProvideTo(&frame);
   ImageDownloaderImpl::ProvideTo(frame);
-  AudioRendererSinkCache::InstallFrameObserver(frame);
+  AudioRendererSinkCache::InstallWindowObserver(*frame.DomWindow());
 }
 
 MediaControls* ModulesInitializer::CreateMediaControls(