REGRESSION(268393@main): [ macOS wk2 ] http/tests/media/video-webm-st…

…all.html is constantly timing out. https://bugs.webkit.org/show_bug.cgi?id=262604 rdar://116443613 Reviewed by Youenn Fablet. Once loading had started, the WebM player would continuously returned true in didLoadingProgress(), by-passing the network stalling detection. We needed the returned value to change back to false so that it only returns true if we did do progress. Covered by existing test being re-enabled. * LayoutTests/platform/mac-wk2/TestExpectations: * Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.h: * Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.mm: (WebCore::MediaPlayerPrivateWebM::didLoadingProgress const): Canonical link: https://commits.webkit.org/268982@main
WebKit · Oct 6, 2023 · 6498f1b · 6498f1b
1 parent 6c8fe3a
commit 6498f1b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -1689,7 +1689,6 @@ webkit.org/b/255407 [ Monterey x86_64 ] imported/w3c/web-platform-tests/html/sem
 [ BigSur Monterey ] fast/images/animated-heics-draw.html [ Skip ]
 [ Ventura+ ] fast/images/animated-heics-draw.html [ Pass Timeout ]
 [ Ventura+ ]  http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js.html [ Failure ]
-[ Monterey+ ] http/tests/media/video-webm-stall.html [ Timeout ] # re-evaluate after webkit.org/b/262604 is resolved.
 [ Monterey+ ] streams/readable-stream-default-controller-error.html [ Pass Crash ]
 [ Monterey+ ] fast/repaint/fixed-move-after-keyboard-scroll.html [ Pass Failure Timeout ]
 [ Monterey+ x86_64 ] http/tests/media/hls/track-in-band-hls-metadata-cue-duration.html [ Pass Failure ]

diff --git a/Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.h b/Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.h
@@ -310,7 +310,7 @@ class MediaPlayerPrivateWebM
     bool m_hasVideo { false };
     bool m_hasAvailableVideoFrame { false };
     bool m_visible { false };
-    bool m_loadingProgressed { false };
+    mutable bool m_loadingProgressed { false };
     bool m_loadFinished { false };
     bool m_parsingSucceeded { true };
     bool m_processingInitializationSegment { false };

diff --git a/Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.mm b/Source/WebCore/platform/graphics/cocoa/MediaPlayerPrivateWebM.mm
@@ -388,7 +388,7 @@ static bool isCopyDisplayedPixelBufferAvailable()
 
 bool MediaPlayerPrivateWebM::didLoadingProgress() const
 {
-    return m_loadingProgressed;
+    return std::exchange(m_loadingProgressed, false);
 }
 
 RefPtr<NativeImage> MediaPlayerPrivateWebM::nativeImageForCurrentTime()