diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/components/timers | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/timers')
| -rw-r--r-- | chromium/components/timers/alarm_timer_chromeos.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/components/timers/alarm_timer_chromeos.cc b/chromium/components/timers/alarm_timer_chromeos.cc index 601b411bd7a..cc550eb5006 100644 --- a/chromium/components/timers/alarm_timer_chromeos.cc +++ b/chromium/components/timers/alarm_timer_chromeos.cc @@ -26,12 +26,12 @@ AlarmTimer::AlarmTimer(bool retain_user_task, bool is_repeating) weak_factory_(this) {} AlarmTimer::~AlarmTimer() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); Stop(); } void AlarmTimer::Stop() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); if (!base::Timer::is_running()) return; @@ -53,7 +53,7 @@ void AlarmTimer::Stop() { } void AlarmTimer::Reset() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); DCHECK(!base::Timer::user_task().is_null()); if (!CanWakeFromSuspend()) { @@ -107,7 +107,7 @@ void AlarmTimer::Reset() { } void AlarmTimer::OnAlarmFdReadableWithoutBlocking() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); DCHECK(base::Timer::IsRunning()); // Read from |alarm_fd_| to ack the event. @@ -119,7 +119,7 @@ void AlarmTimer::OnAlarmFdReadableWithoutBlocking() { } void AlarmTimer::OnTimerFired() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); DCHECK(base::Timer::IsRunning()); DCHECK(pending_task_.get()); |