Changeset 285751 in webkit

Timestamp:

Nov 12, 2021, 3:54:09 PM (5 years ago)

Author:

Russell Epstein

Message:

Revert r285682. rdar://problem/85004449

Location:

branches/safari-612.3.6.0-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (modified) (2 diffs)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (2 diffs)

branches/safari-612.3.6.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-12  Babak Shafiei  <bshafiei@apple.com>
+
+        Revert r285682. rdar://problem/85004449
+
 2021-11-11  Alan Coon  <alancoon@apple.com>
 

branches/safari-612.3.6.0-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

@@ -420 +420 @@
     unsigned m_pendingStatusChanges { 0 };
     int m_cachedItemStatus;
-    int m_runLoopNestingLevel { 0 };
     MediaPlayer::BufferingPolicy m_bufferingPolicy { MediaPlayer::BufferingPolicy::Default };
     bool m_cachedLikelyToKeepUp { false };
@@ -440 +439 @@
     bool m_shouldPlayToPlaybackTarget { false };
 #endif
+    bool m_runningModalPaint { false };
     bool m_waitForVideoOutputMediaDataWillChangeTimedOut { false };
     bool m_haveBeenAskedToPaint { false };

branches/safari-612.3.6.0-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -2564 +2564 @@
     if (m_waitForVideoOutputMediaDataWillChangeTimedOut)
         return;
+    [m_videoOutput requestNotificationOfMediaDataChangeWithAdvanceInterval:0];
 
     // Wait for 1 second.
     MonotonicTime start = MonotonicTime::now();
 
-    std::optional<RunLoop::Timer<MediaPlayerPrivateAVFoundationObjC>> timeoutTimer;
-
-    if (!m_runLoopNestingLevel) {
-        [m_videoOutput requestNotificationOfMediaDataChangeWithAdvanceInterval:0];
-
-        timeoutTimer.emplace(RunLoop::main(), [&] {
-            RunLoop::main().stop();
-        });
-        timeoutTimer->startOneShot(1_s);
-    }
-
-    ++m_runLoopNestingLevel;
+    RunLoop::Timer<MediaPlayerPrivateAVFoundationObjC> timeoutTimer { RunLoop::main(), [] {
+        RunLoop::main().stop();
+    } };
+    timeoutTimer.startOneShot(1_s);
+
+    m_runningModalPaint = true;
     RunLoop::run();
-    --m_runLoopNestingLevel;
-
-    if (m_runLoopNestingLevel) {
-        RunLoop::main().stop();
-        return;
-    }
-
-    bool satisfied = timeoutTimer->isActive();
+    m_runningModalPaint = false;
+
+    bool satisfied = timeoutTimer.isActive();
     if (!satisfied) {
         ERROR_LOG(LOGIDENTIFIER, "timed out");
@@ -2598 +2588 @@
 void MediaPlayerPrivateAVFoundationObjC::outputMediaDataWillChange()
 {
-    if (m_runLoopNestingLevel)
+    if (m_runningModalPaint)
         RunLoop::main().stop();
 }