Changeset 279313 in webkit

Timestamp:

Jun 27, 2021, 2:32:37 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer] SleepDisabler not destroyed when video playback stops
​https://bugs.webkit.org/show_bug.cgi?id=219353

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-06-27
Reviewed by Eric Carlson.

Source/WebCore:

In GStreamer ports the SleepDisabler remained active after EOS because
HTMLMediaElement::updateSleepDisabling() was not being triggered. An explicit clean-up upon
the ended event in the media element is better than any other implicit action.

Test: media/video-ended-does-not-hold-sleep-assertion.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::dispatchEvent):

LayoutTests:

• media/video-ended-does-not-hold-sleep-assertion-expected.txt: Added.
• media/video-ended-does-not-hold-sleep-assertion.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-ended-does-not-hold-sleep-assertion-expected.txt (added)
• LayoutTests/media/video-ended-does-not-hold-sleep-assertion.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-27  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] SleepDisabler not destroyed when video playback stops
+        https://bugs.webkit.org/show_bug.cgi?id=219353
+
+        Reviewed by Eric Carlson.
+
+        * media/video-ended-does-not-hold-sleep-assertion-expected.txt: Added.
+        * media/video-ended-does-not-hold-sleep-assertion.html: Added.
+
 2021-06-26  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-27  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] SleepDisabler not destroyed when video playback stops
+        https://bugs.webkit.org/show_bug.cgi?id=219353
+
+        Reviewed by Eric Carlson.
+
+        In GStreamer ports the SleepDisabler remained active after EOS because
+        HTMLMediaElement::updateSleepDisabling() was not being triggered. An explicit clean-up upon
+        the ended event in the media element is better than any other implicit action.
+
+        Test: media/video-ended-does-not-hold-sleep-assertion.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::dispatchEvent):
+
 2021-06-27  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5863 +5863 @@
     DEBUG_LOG(LOGIDENTIFIER, event.type());
 
-    if (m_removedBehaviorRestrictionsAfterFirstUserGesture && event.type() == eventNames().endedEvent)
-        document().userActivatedMediaFinishedPlaying();
+    if (event.type() == eventNames().endedEvent) {
+        if (m_removedBehaviorRestrictionsAfterFirstUserGesture)
+            document().userActivatedMediaFinishedPlaying();
+
+        updateSleepDisabling();
+    }
 
     HTMLElement::dispatchEvent(event);
@@ -6844 +6848 @@
     return SleepType::None;
 #endif
-    if (!m_player || m_player->paused() || loop())
+    if (m_sentEndEvent || !m_player || m_player->paused() || loop())
         return SleepType::None;