Changeset 247118 in webkit

Timestamp:

Jul 3, 2019 5:08:00 PM (5 years ago)

Author:

jer.noble@apple.com

Message:

HTMLMediaElement can hold onto display sleep assertion while process is suspended.
​https://bugs.webkit.org/show_bug.cgi?id=199471
<rdar://problem/52124320>

If the WebContent process is suspended before HTMLMediaElement gets a callback telling it
that the MediaPlayer has stopped playing, the SleepDisabler may stay set (and hold a display
or system sleep assertion) for the entire duration the process is suspended, causing excess
power drain.

Add a PlatformMediaSessionClient method (and an implementation in HTMLMediaElement) which will
be called during the preperation for process suspension, and in this callback, clear the
SleepDisabler token.

Reviewed by Eric Carlson.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::shouldDisableSleep const):
(WebCore::HTMLMediaElement::processIsSuspendedChanged):

• html/HTMLMediaElement.h:
• platform/audio/PlatformMediaSession.h:

(WebCore::PlatformMediaSessionClient::processIsSuspendedChanged):

• platform/audio/PlatformMediaSessionManager.cpp:

(WebCore::PlatformMediaSessionManager::processWillSuspend):
(WebCore::PlatformMediaSessionManager::processDidResume):

• platform/audio/PlatformMediaSessionManager.h:

(WebCore::PlatformMediaSessionManager::processIsSuspended const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• html/HTMLMediaElement.h (modified) (1 diff)
• platform/audio/PlatformMediaSession.h (modified) (1 diff)
• platform/audio/PlatformMediaSessionManager.cpp (modified) (2 diffs)
• platform/audio/PlatformMediaSessionManager.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-03  Jer Noble  <jer.noble@apple.com>
+
+        HTMLMediaElement can hold onto display sleep assertion while process is suspended.
+        https://bugs.webkit.org/show_bug.cgi?id=199471
+        <rdar://problem/52124320>
+
+        If the WebContent process is suspended before HTMLMediaElement gets a callback telling it
+        that the MediaPlayer has stopped playing, the SleepDisabler may stay set (and hold a display
+        or system sleep assertion) for the entire duration the process is suspended, causing excess
+        power drain.
+
+        Add a PlatformMediaSessionClient method (and an implementation in HTMLMediaElement) which will
+        be called during the preperation for process suspension, and in this callback, clear the
+        SleepDisabler token.
+
+        Reviewed by Eric Carlson.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::shouldDisableSleep const):
+        (WebCore::HTMLMediaElement::processIsSuspendedChanged):
+        * html/HTMLMediaElement.h:
+        * platform/audio/PlatformMediaSession.h:
+        (WebCore::PlatformMediaSessionClient::processIsSuspendedChanged):
+        * platform/audio/PlatformMediaSessionManager.cpp:
+        (WebCore::PlatformMediaSessionManager::processWillSuspend):
+        (WebCore::PlatformMediaSessionManager::processDidResume):
+        * platform/audio/PlatformMediaSessionManager.h:
+        (WebCore::PlatformMediaSessionManager::processIsSuspended const):
+
 2019-07-03  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6924 +6924 @@
 #endif
 
+    if (PlatformMediaSessionManager::sharedManager().processIsSuspended())
+        return SleepType::None;
+
     bool shouldBeAbleToSleep = !hasVideo() || !hasAudio();
 #if ENABLE(MEDIA_STREAM)
@@ -7743 +7746 @@
     return document().processingUserGestureForMedia();
 }
+
+void HTMLMediaElement::processIsSuspendedChanged()
+{
+    updateSleepDisabling();
+}
+
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -895 +895 @@
     bool processingUserGestureForMedia() const final;
     bool hasMediaStreamSource() const final;
+    void processIsSuspendedChanged() final;
 
     void pageMutedStateDidChange() override;

trunk/Source/WebCore/platform/audio/PlatformMediaSession.h

@@ -260 +260 @@
     virtual bool hasMediaStreamSource() const { return false; }
 
+    virtual void processIsSuspendedChanged() { }
+
 protected:
     virtual ~PlatformMediaSessionClient() = default;

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp

@@ -369 +369 @@
     m_processIsSuspended = true;
 
+    forEachSession([&] (auto& session) {
+        session.client().processIsSuspendedChanged();
+    });
+
 #if USE(AUDIO_SESSION)
     if (m_becameActive && shouldDeactivateAudioSession()) {
@@ -384 +388 @@
     m_processIsSuspended = false;
 
+    forEachSession([&] (auto& session) {
+        session.client().processIsSuspendedChanged();
+    });
+
 #if USE(AUDIO_SESSION)
     if (!m_becameActive && activeAudioSessionRequired()) {

trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h

@@ -135 +135 @@
     void forEachMatchingSession(const Function<bool(const PlatformMediaSession&)>& predicate, const Function<void(PlatformMediaSession&)>& matchingCallback);
 
+    bool processIsSuspended() const { return m_processIsSuspended; }
+
 protected:
     friend class PlatformMediaSession;
@@ -147 +149 @@
 
     AudioHardwareListener* audioHardwareListener() { return m_audioHardwareListener.get(); }
-
-    bool processIsSuspended() const { return m_processIsSuspended; }
 
 #if !RELEASE_LOG_DISABLED