Changeset 269802 in webkit

Timestamp:

Nov 13, 2020, 2:38:53 PM (6 years ago)

Author:

ggaren@apple.com

Message:

Removed DeferrableTaskTimer
​https://bugs.webkit.org/show_bug.cgi?id=218874

Reviewed by Chris Dumez.

It was (mostly) redundant.

Source/WebCore:

• platform/Timer.h:

(WebCore::Timer::schedule): This helper function does the same job
that DeferrableTaskTimer used to do.

(WebCore::DeferrableTaskTimer::fired): Deleted.
(WebCore::DeferrableTaskTimer::doTask): Deleted.
(WebCore::DeferrableTaskTimer::cancel): Deleted.

• platform/mediarecorder/MediaRecorderPrivateMock.cpp:

(WebCore::MediaRecorderPrivateMock::fetchData): Use the new helper function.

• platform/mediarecorder/MediaRecorderPrivateMock.h: No need for a data

member anymore since we can use the schedule() convenience function instead.

Source/WebKit:

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::updateReportedMediaCaptureState):

• UIProcess/WebPageProxy.h: Use WTF::RunLoop::Timer instead of

WebCore::Timer because WebCore::Timer for WebKit code in the UI process
is a no-no, which can crash if the UI process also uses WebThread.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/Timer.h (modified) (4 diffs)
• WebCore/platform/mediarecorder/MediaRecorderPrivateMock.cpp (modified) (1 diff)
• WebCore/platform/mediarecorder/MediaRecorderPrivateMock.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• WebKit/UIProcess/WebPageProxy.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Removed DeferrableTaskTimer
+        https://bugs.webkit.org/show_bug.cgi?id=218874
+
+        Reviewed by Chris Dumez.
+
+        It was (mostly) redundant.
+
+        * platform/Timer.h:
+        (WebCore::Timer::schedule): This helper function does the same job
+        that DeferrableTaskTimer used to do.
+
+        (WebCore::DeferrableTaskTimer::fired): Deleted.
+        (WebCore::DeferrableTaskTimer::doTask): Deleted.
+        (WebCore::DeferrableTaskTimer::cancel): Deleted.
+
+        * platform/mediarecorder/MediaRecorderPrivateMock.cpp:
+        (WebCore::MediaRecorderPrivateMock::fetchData): Use the new helper function.
+
+        * platform/mediarecorder/MediaRecorderPrivateMock.h: No need for a data
+        member anymore since we can use the schedule() convenience function instead.
+
 2020-11-13  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebCore/platform/Timer.h

@@ -53 +53 @@
 
     void startRepeating(Seconds repeatInterval) { start(repeatInterval, repeatInterval); }
-    void startOneShot(Seconds interval) { start(interval, 0_s); }
+    void startOneShot(Seconds delay) { start(delay, 0_s); }
 
     WEBCORE_EXPORT void stop();
@@ -110 +110 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
+    static void schedule(Seconds delay, WTF::Function<void()>&& function)
+    {
+        auto* timer = new Timer([] { });
+        timer->m_function = [timer, function = WTFMove(function)] {
+            function();
+            delete timer;
+        };
+        timer->startOneShot(delay);
+    }
+
     template <typename TimerFiredClass, typename TimerFiredBaseClass>
     Timer(TimerFiredClass& object, void (TimerFiredBaseClass::*function)())
@@ -150 +160 @@
     }
 
-    DeferrableOneShotTimer(WTF::Function<void ()>&& function, Seconds delay)
+    DeferrableOneShotTimer(WTF::Function<void()>&& function, Seconds delay)
         : m_function(WTFMove(function))
         , m_delay(delay)
@@ -196 +206 @@
 };
 
-class DeferrableTaskTimer final : private TimerBase {
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    DeferrableTaskTimer() = default;
-
-    void doTask(Function<void()>&&, Seconds);
-    void cancel();
-    bool isActive() const { return TimerBase::isActive(); }
-
-private:
-    void fired() final;
-
-    Function<void()> m_function;
-};
-
-inline void DeferrableTaskTimer::fired()
-{
-    std::exchange(m_function, { })();
 }
-
-inline void DeferrableTaskTimer::doTask(Function<void()>&& function, Seconds delay)
-{
-    ASSERT(!isActive());
-    ASSERT(!m_function);
-    m_function = WTFMove(function);
-    startOneShot(delay);
-}
-
-inline void DeferrableTaskTimer::cancel()
-{
-    std::exchange(m_function, { });
-    stop();
-}
-
-}

trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.cpp

@@ -102 +102 @@
 
     // Delay calling the completion handler a bit to mimick real writer behavior.
-    m_delayCompletingTimer.doTask([completionHandler = WTFMove(completionHandler), buffer = WTFMove(buffer), mimeType = mimeType(), timeCode = MonotonicTime::now().secondsSinceEpoch().value()]() mutable {
+    Timer::schedule(50_ms, [completionHandler = WTFMove(completionHandler), buffer = WTFMove(buffer), mimeType = mimeType(), timeCode = MonotonicTime::now().secondsSinceEpoch().value()]() mutable {
         completionHandler(WTFMove(buffer), mimeType, timeCode);
-    }, 50_ms);
+    });
 }
 

trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateMock.h

@@ -33 +33 @@
 namespace WebCore {
 
-class DeferrableTaskTimer;
 class MediaStreamTrackPrivate;
 
@@ -59 +58 @@
     String m_audioTrackID;
     String m_videoTrackID;
-    DeferrableTaskTimer m_delayCompletingTimer;
 };
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-11-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Removed DeferrableTaskTimer
+        https://bugs.webkit.org/show_bug.cgi?id=218874
+
+        Reviewed by Chris Dumez.
+
+        It was (mostly) redundant.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::updateReportedMediaCaptureState):
+        * UIProcess/WebPageProxy.h: Use WTF::RunLoop::Timer instead of
+        WebCore::Timer because WebCore::Timer for WebKit code in the UI process
+        is a no-no, which can crash if the UI process also uses WebThread.
+
 2020-11-13  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -510 +510 @@
 #endif
     , m_pageLoadState(*this)
+    , m_updateReportedMediaCaptureStateTimer(RunLoop::main(), this, &WebPageProxy::updateReportedMediaCaptureState)
     , m_inspectorController(makeUnique<WebPageInspectorController>(*this))
 #if ENABLE(REMOTE_INSPECTOR)
@@ -9053 +9054 @@
     bool willReportCapture = activeCaptureState;
 
-    if (haveReportedCapture && !willReportCapture && m_delayStopCapturingReportingTimer.isActive())
-        return;
-
-    if (!haveReportedCapture && willReportCapture) {
-        m_delayStopCapturingReportingTimer.doTask([this] {
-            updateReportedMediaCaptureState();
-        }, m_mediaCaptureReportingDelay);
-    }
+    if (haveReportedCapture && !willReportCapture && m_updateReportedMediaCaptureStateTimer.isActive())
+        return;
+
+    if (!haveReportedCapture && willReportCapture)
+        m_updateReportedMediaCaptureStateTimer.startOneShot(m_mediaCaptureReportingDelay);
 
     m_reportedMediaCaptureState = activeCaptureState;

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -2756 +2756 @@
     // To make sure capture indicators are visible long enough, m_reportedMediaCaptureState is the same as m_mediaState except that we might delay a bit transition from capturing to not-capturing.
     WebCore::MediaProducer::MediaStateFlags m_reportedMediaCaptureState { WebCore::MediaProducer::IsNotPlaying };
-    WebCore::DeferrableTaskTimer m_delayStopCapturingReportingTimer;
+    RunLoop::Timer<WebPageProxy> m_updateReportedMediaCaptureStateTimer;
     static constexpr Seconds DefaultMediaCaptureReportingDelay { 3_s };
     Seconds m_mediaCaptureReportingDelay { DefaultMediaCaptureReportingDelay };