Changeset 252890 in webkit

Timestamp:

Nov 26, 2019 10:16:04 AM (4 years ago)

Author:

youenn@apple.com

Message:

Update capturing document media state when entering b/f cache
​https://bugs.webkit.org/show_bug.cgi?id=204589

Reviewed by Chris Dumez.

Source/WebCore:

Remove enqueuing the task in configureTrackRendering.
This allows stopTrack to trigger the track rendering configuration and document media state computation.
Covered by updated test.

• Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::MediaStreamTrack):
(WebCore::MediaStreamTrack::configureTrackRendering):
(WebCore::MediaStreamTrack::suspend):
(WebCore::MediaStreamTrack::stop): Deleted.

• Modules/mediastream/MediaStreamTrack.h:

LayoutTests:

• http/tests/navigation/page-cache-mediastream-expected.txt:
• http/tests/navigation/page-cache-mediastream.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/navigation/page-cache-mediastream-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/navigation/page-cache-mediastream.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-26  youenn fablet  <youenn@apple.com>
+
+        Update capturing document media state when entering b/f cache
+        https://bugs.webkit.org/show_bug.cgi?id=204589
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/navigation/page-cache-mediastream-expected.txt:
+        * http/tests/navigation/page-cache-mediastream.html:
+
 2019-11-26  youenn fablet  <youenn@apple.com>
 

trunk/LayoutTests/http/tests/navigation/page-cache-mediastream-expected.txt

@@ -8 +8 @@
 pageshow - from cache
 PASS Page did enter and was restored from the page cache
+page media state is 'IsNotPlaying'
 PASS successfullyParsed is true
 

trunk/LayoutTests/http/tests/navigation/page-cache-mediastream.html

@@ -17 +17 @@
         testPassed("Page did enter and was restored from the page cache");
         restoredFromPageCache = true;
+
+        if (window.internals)
+            debug("page media state is '" + internals.pageMediaState() + "'");
 
         if (!canvasStream.active)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-26  youenn fablet  <youenn@apple.com>
+
+        Update capturing document media state when entering b/f cache
+        https://bugs.webkit.org/show_bug.cgi?id=204589
+
+        Reviewed by Chris Dumez.
+
+        Remove enqueuing the task in configureTrackRendering.
+        This allows stopTrack to trigger the track rendering configuration and document media state computation.
+        Covered by updated test.
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::MediaStreamTrack):
+        (WebCore::MediaStreamTrack::configureTrackRendering):
+        (WebCore::MediaStreamTrack::suspend):
+        (WebCore::MediaStreamTrack::stop): Deleted.
+        * Modules/mediastream/MediaStreamTrack.h:
+
 2019-11-26  youenn fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -71 +71 @@
     : ActiveDOMObject(&context)
     , m_private(WTFMove(privateTrack))
-    , m_taskQueue(context)
     , m_isCaptureTrack(m_private->isCaptureTrack())
     , m_mediaSession(PlatformMediaSession::create(*this))
@@ -536 +535 @@
 void MediaStreamTrack::configureTrackRendering()
 {
-    m_taskQueue.enqueueTask([this] {
-        if (m_mediaSession && m_private->type() == RealtimeMediaSource::Type::Audio)
-            m_mediaSession->canProduceAudioChanged();
-
-        if (auto document = this->document())
-            document->updateIsPlayingMedia();
-    });
+    if (m_mediaSession && m_private->type() == RealtimeMediaSource::Type::Audio)
+        m_mediaSession->canProduceAudioChanged();
+
+    if (auto document = this->document())
+        document->updateIsPlayingMedia();
 
     // 4.3.1
     // ... media from the source only flows when a MediaStreamTrack object is both unmuted and enabled
-}
-
-void MediaStreamTrack::stop()
-{
-    stopTrack();
-    m_taskQueue.close();
 }
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -176 +176 @@
 
     // ActiveDOMObject API.
-    void stop() final;
+    void stop() final { stopTrack(); }
     const char* activeDOMObjectName() const override;
     void suspend(ReasonForSuspension) final;
@@ -217 +217 @@
     MediaTrackConstraints m_constraints;
     std::unique_ptr<DOMPromiseDeferred<void>> m_promise;
-    GenericTaskQueue<ScriptExecutionContext> m_taskQueue;
     GenericTaskQueue<Timer> m_eventTaskQueue;