diff --git a/rtc_base/task_utils/repeating_task.cc b/rtc_base/task_utils/repeating_task.cc index 71911e6982..3b84701952 100644 --- a/rtc_base/task_utils/repeating_task.cc +++ b/rtc_base/task_utils/repeating_task.cc @@ -21,13 +21,12 @@ RepeatingTaskBase::RepeatingTaskBase(TaskQueueBase* task_queue, TimeDelta first_delay) : task_queue_(task_queue), next_run_time_(Timestamp::Micros(rtc::TimeMicros()) + first_delay) { - sequence_checker_.Detach(); } RepeatingTaskBase::~RepeatingTaskBase() = default; bool RepeatingTaskBase::Run() { - RTC_DCHECK_RUN_ON(&sequence_checker_); + RTC_DCHECK_RUN_ON(task_queue_); // Return true to tell the TaskQueue to destruct this object. if (next_run_time_.IsPlusInfinity()) return true; @@ -53,7 +52,7 @@ bool RepeatingTaskBase::Run() { } void RepeatingTaskBase::Stop() { - RTC_DCHECK_RUN_ON(&sequence_checker_); + RTC_DCHECK_RUN_ON(task_queue_); RTC_DCHECK(next_run_time_.IsFinite()); next_run_time_ = Timestamp::PlusInfinity(); } diff --git a/rtc_base/task_utils/repeating_task.h b/rtc_base/task_utils/repeating_task.h index 75d03bfe5e..f7ae55ee97 100644 --- a/rtc_base/task_utils/repeating_task.h +++ b/rtc_base/task_utils/repeating_task.h @@ -19,7 +19,6 @@ #include "api/task_queue/task_queue_base.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" -#include "rtc_base/synchronization/sequence_checker.h" namespace webrtc { @@ -41,14 +40,7 @@ class RepeatingTaskBase : public QueuedTask { TaskQueueBase* const task_queue_; // This is always finite, except for the special case where it's PlusInfinity // to signal that the task should stop. - Timestamp next_run_time_ RTC_GUARDED_BY(sequence_checker_); - // We use a SequenceChecker to check for correct usage instead of using - // RTC_DCHECK_RUN_ON(task_queue_). This is to work around a compatibility - // issue with some TQ implementations such as rtc::Thread that don't - // consistently set themselves as the 'current' TQ when running tasks. - // The SequenceChecker detects those implementations differently but gives - // the same effect as far as thread safety goes. - SequenceChecker sequence_checker_; + Timestamp next_run_time_ RTC_GUARDED_BY(task_queue_); }; // The template closure pattern is based on rtc::ClosureTask.