Changeset 245255 in webkit

Timestamp:

May 13, 2019 3:01:12 PM (5 years ago)

Author:

jer.noble@apple.com

Message:

Take out MediaPlayback UI assertion when any WebProcess is playing audible media
​https://bugs.webkit.org/show_bug.cgi?id=197798

Reviewed by Chris Dumez.

To keep the system from suspending the UIProcess (and all the other constellation of processes that
are necessary to play media), take a UIProcess assertion with the MediaPlayback reason whenever there
is a WebContent process that is playing audible media.

• Platform/spi/ios/AssertionServicesSPI.h:
• UIProcess/ProcessAssertion.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::updatePlayingMediaDidChange):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::setWebProcessIsPlayingAudibleMedia):
(WebKit::WebProcessPool::clearWebProcessIsPlayingAudibleMedia):

• UIProcess/WebProcessPool.h:
• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::webPageMediaStateDidChange):

• UIProcess/WebProcessProxy.h:
• UIProcess/ios/ProcessAssertionIOS.mm:

(WebKit::toBKSProcessAssertionReason):
(WebKit::ProcessAssertion::ProcessAssertion):

• WebProcess/WebProcess.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/AssertionServicesSPI.h (modified) (1 diff)
• UIProcess/ProcessAssertion.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.h (modified) (2 diffs)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessProxy.h (modified) (2 diffs)
• UIProcess/ios/ProcessAssertionIOS.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-13  Jer Noble  <jer.noble@apple.com>
+
+        Take out MediaPlayback UI assertion when any WebProcess is playing audible media
+        https://bugs.webkit.org/show_bug.cgi?id=197798
+
+        Reviewed by Chris Dumez.
+
+        To keep the system from suspending the UIProcess (and all the other constellation of processes that
+        are necessary to play media), take a UIProcess assertion with the MediaPlayback reason whenever there
+        is a WebContent process that is playing audible media.
+
+        * Platform/spi/ios/AssertionServicesSPI.h:
+        * UIProcess/ProcessAssertion.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::updatePlayingMediaDidChange):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::setWebProcessIsPlayingAudibleMedia):
+        (WebKit::WebProcessPool::clearWebProcessIsPlayingAudibleMedia):
+        * UIProcess/WebProcessPool.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::webPageMediaStateDidChange):
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+        (WebKit::toBKSProcessAssertionReason):
+        (WebKit::ProcessAssertion::ProcessAssertion):
+        * WebProcess/WebProcess.h:
+
 2019-05-13  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/AssertionServicesSPI.h

@@ -70 +70 @@
 
 enum {
+    BKSProcessAssertionReasonMediaPlayback = 1,
     BKSProcessAssertionReasonFinishTask = 4,
     BKSProcessAssertionReasonExtension = 13,

trunk/Source/WebKit/UIProcess/ProcessAssertion.h

@@ -53 +53 @@
     FinishTask,
     FinishTaskUnbounded,
+    MediaPlayback,
 };
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -1038 +1038 @@
 
     stopAllURLSchemeTasks();
+    updatePlayingMediaDidChange(MediaProducer::IsNotPlaying);
 }
 
@@ -7071 +7072 @@
         m_pageLoadState.reset(transaction);
     }
+
+    updatePlayingMediaDidChange(MediaProducer::IsNotPlaying);
 
     // FIXME: <rdar://problem/38676604> In case of process swaps, the old process should gracefully suspend instead of terminating.
@@ -8093 +8096 @@
     focusManager->updatePlaybackAttributesFromMediaState(this, sourceElementID, newState);
 #endif
-    updatePlayingMediaDidChange(newState);
+    if (!m_isClosed)
+        updatePlayingMediaDidChange(newState);
 }
 
@@ -8131 +8135 @@
     if ((oldState & MediaProducer::HasAudioOrVideo) != (m_mediaState & MediaProducer::HasAudioOrVideo))
         videoControlsManagerDidChange();
+
+    m_process->webPageMediaStateDidChange(*this);
 }
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -1101 +1101 @@
 {
     ASSERT(m_processes.contains(process));
+    ASSERT(!m_processesPlayingAudibleMedia.contains(process->coreProcessIdentifier()));
 
     if (m_prewarmedProcess == process) {
@@ -2571 +2572 @@
 }
 
+void WebProcessPool::setWebProcessIsPlayingAudibleMedia(WebCore::ProcessIdentifier processID)
+{
+    auto* process = WebProcessProxy::processForIdentifier(processID);
+    ASSERT(process);
+
+    RELEASE_LOG(ProcessSuspension, "Web process pid %u is now playing audible media", (unsigned)process->processIdentifier());
+
+    if (m_processesPlayingAudibleMedia.isEmpty()) {
+        RELEASE_LOG(ProcessSuspension, "The number of processes playing audible media is now one. Taking UI process assertion.");
+
+        ASSERT(!m_uiProcessMediaPlaybackAssertion);
+        m_uiProcessMediaPlaybackAssertion = std::make_unique<ProcessAssertion>(getCurrentProcessID(), "WebKit Media Playback"_s, AssertionState::Foreground, AssertionReason::MediaPlayback);
+    }
+
+    auto result = m_processesPlayingAudibleMedia.add(processID, nullptr);
+    ASSERT(result.isNewEntry);
+    result.iterator->value = std::make_unique<ProcessAssertion>(process->processIdentifier(), "WebKit Media Playback"_s, AssertionState::Foreground, AssertionReason::MediaPlayback);
+}
+
+void WebProcessPool::clearWebProcessIsPlayingAudibleMedia(WebCore::ProcessIdentifier processID)
+{
+    auto result = m_processesPlayingAudibleMedia.take(processID);
+    ASSERT_UNUSED(result, result);
+
+    auto* process = WebProcessProxy::processForIdentifier(processID);
+    ASSERT(process);
+    RELEASE_LOG(ProcessSuspension, "Web process pid %u is no longer playing audible media", (unsigned)process->processIdentifier());
+
+    if (m_processesPlayingAudibleMedia.isEmpty()) {
+        RELEASE_LOG(ProcessSuspension, "The number of processes playing audible media now zero. Releasing UI process assertion.");
+
+        ASSERT(m_uiProcessMediaPlaybackAssertion);
+        m_uiProcessMediaPlaybackAssertion = nullptr;
+    }
+}
+
 } // namespace WebKit

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -506 +506 @@
     void clearWebProcessHasUploads(WebCore::ProcessIdentifier);
 
+    void setWebProcessIsPlayingAudibleMedia(WebCore::ProcessIdentifier);
+    void clearWebProcessIsPlayingAudibleMedia(WebCore::ProcessIdentifier);
+
     void disableDelayedWebProcessLaunch() { m_isDelayedWebProcessLaunchDisabled = true; }
 
@@ -789 +792 @@
     HashMap<WebCore::ProcessIdentifier, std::unique_ptr<ProcessAssertion>> m_processesWithUploads;
     std::unique_ptr<ProcessAssertion> m_uiProcessUploadAssertion;
+
+    HashMap<WebCore::ProcessIdentifier, std::unique_ptr<ProcessAssertion>> m_processesPlayingAudibleMedia;
+    std::unique_ptr<ProcessAssertion> m_uiProcessMediaPlaybackAssertion;
+
 #if PLATFORM(IOS)
     // FIXME: Delayed process launch is currently disabled on iOS for performance reasons (rdar://problem/49074131).

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -1210 +1210 @@
 #endif
 }
-    
+
+void WebProcessProxy::webPageMediaStateDidChange(WebPageProxy&)
+{
+    bool newHasAudibleWebPage = WTF::anyOf(m_pageMap.values(), [] (auto& page) { return page->isPlayingAudio(); });
+    if (m_hasAudibleWebPage == newHasAudibleWebPage)
+        return;
+    m_hasAudibleWebPage = newHasAudibleWebPage;
+
+    if (m_hasAudibleWebPage)
+        processPool().setWebProcessIsPlayingAudibleMedia(coreProcessIdentifier());
+    else
+        processPool().clearWebProcessIsPlayingAudibleMedia(coreProcessIdentifier());
+}
+
 void WebProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
 {

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -307 +307 @@
 #endif
 
+    void webPageMediaStateDidChange(WebPageProxy&);
+
 protected:
     static uint64_t generatePageID();
@@ -486 +488 @@
     bool m_hasCommittedAnyProvisionalLoads { false };
     bool m_isPrewarmed;
+    bool m_hasAudibleWebPage { false };
 
 #if PLATFORM(WATCHOS)

trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm

@@ -182 +182 @@
     case AssertionReason::FinishTaskUnbounded:
         return BKSProcessAssertionReasonFinishTaskUnbounded;
+    case AssertionReason::MediaPlayback:
+        return BKSProcessAssertionReasonMediaPlayback;
     }
 }