Index: third_party/WebKit/Source/platform/scheduler/base/time_domain.cc |
diff --git a/third_party/WebKit/Source/platform/scheduler/base/time_domain.cc b/third_party/WebKit/Source/platform/scheduler/base/time_domain.cc |
index 161830e2143fbbf88248cf079a797371ff96872e..919543e9ecf1dc6f65158aa9eb0bd6c4a73e3445 100644 |
--- a/third_party/WebKit/Source/platform/scheduler/base/time_domain.cc |
+++ b/third_party/WebKit/Source/platform/scheduler/base/time_domain.cc |
@@ -52,8 +52,10 @@ |
queue->set_scheduled_time_domain_wakeup(delayed_run_time); |
// If |queue| is the first wakeup then request the wakeup. |
- if (delayed_wakeup_queue_.min().queue == queue) |
- RequestWakeupAt(now, delayed_run_time); |
+ if (delayed_wakeup_queue_.min().queue == queue) { |
+ base::TimeDelta delay = std::max(base::TimeDelta(), delayed_run_time - now); |
+ RequestWakeup(now, delay); |
+ } |
if (observer_) |
observer_->OnTimeDomainHasDelayedWork(queue); |
@@ -73,18 +75,9 @@ |
return; |
DCHECK_NE(queue->scheduled_time_domain_wakeup(), base::TimeTicks()); |
- DCHECK(!delayed_wakeup_queue_.empty()); |
- base::TimeTicks prev_first_wakeup = delayed_wakeup_queue_.min().time; |
// O(log n) |
delayed_wakeup_queue_.erase(queue->heap_handle()); |
- |
- if (delayed_wakeup_queue_.empty()) { |
- CancelWakeupAt(prev_first_wakeup); |
- } else if (prev_first_wakeup != delayed_wakeup_queue_.min().time) { |
- CancelWakeupAt(prev_first_wakeup); |
- RequestWakeupAt(Now(), delayed_wakeup_queue_.min().time); |
- } |
} |
void TimeDomain::WakeupReadyDelayedQueues(LazyNow* lazy_now) { |