Changeset 295178 in webkit

Timestamp:

Jun 2, 2022, 11:45:13 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick 0062ea642e7f. rdar://problem/93525670

MediaController should be an ContextDestructionObserver
​https://bugs.webkit.org/show_bug.cgi?id=240749
<rdar://93525670>

Reviewed by Youenn Fablet.

• html/MediaController.cpp: (WebCore::MediaController::MediaController):
• html/MediaController.h:

Canonical link: ​https://commits.webkit.org/250882@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@294664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore/html

Files:

• MediaController.cpp (modified) (2 diffs)
• MediaController.h (modified) (4 diffs)

branches/safari-613-branch/Source/WebCore/html/MediaController.cpp

@@ -48 +48 @@
 
 MediaController::MediaController(ScriptExecutionContext& context)
-    : m_paused(false)
+    : ContextDestructionObserver(&context)
+    , m_paused(false)
     , m_defaultPlaybackRate(1)
     , m_volume(1)
@@ -59 +60 @@
     , m_closedCaptionsVisible(false)
     , m_clock(PAL::Clock::create())
-    , m_scriptExecutionContext(context)
     , m_timeupdateTimer(*this, &MediaController::scheduleTimeupdateEvent)
 {

branches/safari-613-branch/Source/WebCore/html/MediaController.h

@@ -28 +28 @@
 #if ENABLE(VIDEO)
 
+#include "ContextDestructionObserver.h"
 #include "Event.h"
 #include "EventTarget.h"
@@ -42 +43 @@
 class HTMLMediaElement;
 
-class MediaController final : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData {
+class MediaController final
+    : public RefCounted<MediaController>
+    , public MediaControllerInterface
+    , public ContextDestructionObserver
+    , public EventTargetWithInlineData {
     WTF_MAKE_ISO_ALLOCATED(MediaController);
 public:
@@ -96 +101 @@
     void derefEventTarget() final { deref(); }
     EventTargetInterface eventTargetInterface() const final { return MediaControllerEventTargetInterfaceType; }
-    ScriptExecutionContext* scriptExecutionContext() const final { return &m_scriptExecutionContext; };
+    ScriptExecutionContext* scriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); };
 
     void addMediaElement(HTMLMediaElement&);
@@ -148 +153 @@
     bool m_closedCaptionsVisible;
     std::unique_ptr<PAL::Clock> m_clock;
-    ScriptExecutionContext& m_scriptExecutionContext;
     Timer m_timeupdateTimer;
     MonotonicTime m_previousTimeupdateTime;