Use HeapObserverList for ContextLifecycleObserver

Use the HeapObserverList that was added in crrev.com/c/2054687 for
ContextLifecycleObserver.

Bug: 1052319
Change-Id: If501c2f969add4485675eb9c8d6a1bbe5cd11491
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2059349
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741782}

third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h

@@ -77,7 +77,7 @@ class CORE_EXPORT ScriptPromiseResolver
   }
 
   // ContextLifecycleObserver implementation.
-  void ContextDestroyed(ExecutionContext*) override { Detach(); }
+  void ContextDestroyed() override { Detach(); }
 
   // Calling this function makes the resolver release its internal resources.
   // That means the associated promise will never be resolved or rejected

third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc

@@ -334,7 +334,7 @@ v8::MaybeLocal<v8::Value> V8ScriptRunner::RunCompiledScript(
   if (GetMicrotasksScopeDepth(isolate, microtask_queue) > kMaxRecursionDepth)
     return ThrowStackOverflowExceptionIfNeeded(isolate, microtask_queue);
 
-  CHECK(!context->IsIteratingOverObservers());
+  CHECK(!context->ContextLifecycleObserverList().IsIteratingOverObservers());
 
   // Run the script and keep track of the current recursion depth.
   v8::MaybeLocal<v8::Value> result;
@@ -413,7 +413,7 @@ v8::MaybeLocal<v8::Value> V8ScriptRunner::CallAsConstructor(
   if (depth >= kMaxRecursionDepth)
     return ThrowStackOverflowExceptionIfNeeded(isolate, microtask_queue);
 
-  CHECK(!context->IsIteratingOverObservers());
+  CHECK(!context->ContextLifecycleObserverList().IsIteratingOverObservers());
 
   if (ScriptForbiddenScope::IsScriptForbidden()) {
     ThrowScriptForbiddenException(isolate);
@@ -466,7 +466,7 @@ v8::MaybeLocal<v8::Value> V8ScriptRunner::CallFunction(
   if (depth >= kMaxRecursionDepth)
     return ThrowStackOverflowExceptionIfNeeded(isolate, microtask_queue);
 
-  CHECK(!context->IsIteratingOverObservers());
+  CHECK(!context->ContextLifecycleObserverList().IsIteratingOverObservers());
 
   if (ScriptForbiddenScope::IsScriptForbidden()) {
     ThrowScriptForbiddenException(isolate);

third_party/blink/renderer/core/animation/animation.cc

@@ -1398,7 +1398,7 @@ bool Animation::HasPendingActivity() const {
          (!finished_ && HasEventListeners(event_type_names::kFinish));
 }
 
-void Animation::ContextDestroyed(ExecutionContext*) {
+void Animation::ContextDestroyed() {
   finished_ = true;
   pending_finished_event_ = nullptr;
   pending_cancelled_event_ = nullptr;

third_party/blink/renderer/core/animation/animation.h

@@ -184,7 +184,7 @@ class CORE_EXPORT Animation : public EventTargetWithInlineData,
   const AtomicString& InterfaceName() const override;
   ExecutionContext* GetExecutionContext() const override;
   bool HasPendingActivity() const final;
-  void ContextDestroyed(ExecutionContext*) override;
+  void ContextDestroyed() override;
 
   double playbackRate() const;
   void setPlaybackRate(double, ExceptionState& = ASSERT_NO_EXCEPTION);

third_party/blink/renderer/core/css/media_query_list.cc

@@ -72,7 +72,7 @@ bool MediaQueryList::HasPendingActivity() const {
          (listeners_.size() || HasEventListeners(event_type_names::kChange));
 }
 
-void MediaQueryList::ContextDestroyed(ExecutionContext*) {
+void MediaQueryList::ContextDestroyed() {
   listeners_.clear();
   RemoveAllEventListeners();
 }

third_party/blink/renderer/core/css/media_query_list.h

@@ -80,7 +80,7 @@ class CORE_EXPORT MediaQueryList final
   bool HasPendingActivity() const final;
 
   // From ContextLifecycleObserver
-  void ContextDestroyed(ExecutionContext*) override;
+  void ContextDestroyed() override;
 
   const AtomicString& InterfaceName() const override;
   ExecutionContext* GetExecutionContext() const override;

third_party/blink/renderer/core/css/media_query_list_test.cc

@@ -29,7 +29,7 @@ TEST(MediaQueryListTest, CrashInStop) {
       MakeGarbageCollected<MediaQueryMatcher>(*document),
       MediaQuerySet::Create());
   list->AddListener(MakeGarbageCollected<TestListener>());
-  list->ContextDestroyed(document->ToExecutionContext());
+  list->ContextDestroyed();
   // This test passes if it's not crashed.
 }
 

third_party/blink/renderer/core/display_lock/display_lock_context.cc

@@ -138,7 +138,7 @@ void DisplayLockContext::Dispose() {
   state_ = kUnlocked;
 }
 
-void DisplayLockContext::ContextDestroyed(ExecutionContext*) {
+void DisplayLockContext::ContextDestroyed() {
   FinishUpdateResolver(kReject, rejection_names::kExecutionContextDestroyed);
   state_ = kUnlocked;
 }

third_party/blink/renderer/core/display_lock/display_lock_context.h

@@ -138,7 +138,7 @@ class CORE_EXPORT DisplayLockContext final
   void Dispose();
 
   // ContextLifecycleObserver overrides.
-  void ContextDestroyed(ExecutionContext*) override;
+  void ContextDestroyed() override;
 
   // Set which reasons activate, as a mask of DisplayLockActivationReason enums.
   void SetActivatable(uint16_t activatable_mask);

third_party/blink/renderer/core/dom/document.cc

@@ -597,8 +597,8 @@ class Document::NetworkStateObserver final
     probe::NetworkStateChanged(document->GetFrame(), on_line);
   }
 
-  void ContextDestroyed(ExecutionContext* context) override {
-    UnregisterAsObserver(context);
+  void ContextDestroyed() override {
+    UnregisterAsObserver(GetExecutionContext());
   }
 
   void UnregisterAsObserver(ExecutionContext* context) {

third_party/blink/renderer/core/dom/events/event_queue.cc

@@ -105,8 +105,8 @@ void EventQueue::DispatchEvent(Event* event) {
     target->DispatchEvent(*event);
 }
 
-void EventQueue::ContextDestroyed(ExecutionContext* context) {
-  Close(context);
+void EventQueue::ContextDestroyed() {
+  Close(GetExecutionContext());
 }
 
 void EventQueue::Close(ExecutionContext* context) {

third_party/blink/renderer/core/dom/events/event_queue.h

@@ -53,7 +53,7 @@ class CORE_EXPORT EventQueue final : public GarbageCollected<EventQueue>,
   bool RemoveEvent(Event&);
   void DispatchEvent(Event*);
 
-  void ContextDestroyed(ExecutionContext*) override;
+  void ContextDestroyed() override;
   void Close(ExecutionContext*);
   void DoCancelAllEvents(ExecutionContext*);
 

third_party/blink/renderer/core/dom/events/event_target_impl.cc

@@ -4,6 +4,8 @@
 
 #include "third_party/blink/renderer/core/dom/events/event_target_impl.h"
 
+#include "third_party/blink/renderer/core/execution_context/execution_context.h"
+
 namespace blink {
 
 const AtomicString& EventTargetImpl::InterfaceName() const {

third_party/blink/renderer/core/dom/scripted_idle_task_controller.cc

@@ -228,7 +228,7 @@ void ScriptedIdleTaskController::RunCallback(
   idle_tasks_.erase(id);
 }
 
-void ScriptedIdleTaskController::ContextDestroyed(ExecutionContext*) {
+void ScriptedIdleTaskController::ContextDestroyed() {
   idle_tasks_.clear();
 }
 

third_party/blink/renderer/core/dom/scripted_idle_task_controller.h

@@ -83,7 +83,7 @@ class CORE_EXPORT ScriptedIdleTaskController
   void CancelCallback(CallbackId);
 
   // ContextLifecycleStateObserver interface.
-  void ContextDestroyed(ExecutionContext*) override;
+  void ContextDestroyed() override;
   void ContextLifecycleStateChanged(mojom::FrameLifecycleState) override;
 
   void CallbackFired(CallbackId,

third_party/blink/renderer/core/execution_context/BUILD.gn

@@ -10,8 +10,6 @@ blink_core_sources("execution_context") {
     "agent.h",
     "agent_metrics_collector.cc",
     "agent_metrics_collector.h",
-    "context_lifecycle_notifier.cc",
-    "context_lifecycle_notifier.h",
     "context_lifecycle_observer.cc",
     "context_lifecycle_observer.h",
     "context_lifecycle_state_observer.cc",

third_party/blink/renderer/core/execution_context/context_lifecycle_observer.cc

@@ -41,14 +41,44 @@ void ContextClient::Trace(Visitor* visitor) {
 
 ContextLifecycleObserver::ContextLifecycleObserver(Document* document,
                                                    Type type)
-    : LifecycleObserver(document ? document->ToExecutionContext() : nullptr),
-      observer_type_(type) {}
+    : ContextLifecycleObserver(
+          document ? document->ToExecutionContext() : nullptr,
+          type) {}
+
+ContextLifecycleObserver::ContextLifecycleObserver(
+    ExecutionContext* execution_context,
+    Type type)
+    : observer_type_(type) {
+  SetExecutionContext(execution_context);
+}
+
+void ContextLifecycleObserver::ObserverListWillBeCleared() {
+  execution_context_ = nullptr;
+}
+
+void ContextLifecycleObserver::SetExecutionContext(
+    ExecutionContext* execution_context) {
+  if (execution_context == execution_context_)
+    return;
+
+  if (execution_context_)
+    execution_context_->ContextLifecycleObserverList().RemoveObserver(this);
+
+  execution_context_ = execution_context;
+
+  if (execution_context_)
+    execution_context_->ContextLifecycleObserverList().AddObserver(this);
+}
 
 LocalFrame* ContextLifecycleObserver::GetFrame() const {
   auto* document = Document::DynamicFrom(GetExecutionContext());
   return document ? document->GetFrame() : nullptr;
 }
 
+void ContextLifecycleObserver::Trace(Visitor* visitor) {
+  visitor->Trace(execution_context_);
+}
+
 DOMWindowClient::DOMWindowClient(LocalDOMWindow* window)
     : dom_window_(window) {}