Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1055)

Unified Diff: third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc

Issue 2708963002: Fix potential DCHECK in TaskQueueThrottler::IncreaseThrottleRefCount (Closed)
Patch Set: Addressing review comments. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
index 8d4288620c54fe7c72e770984eaac026a5621933..e6a894af2fa43c3566f5a16523f40fd70f6a0045 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
@@ -335,6 +335,9 @@ void TaskQueueThrottler::IncreaseThrottleRefCount(TaskQueue* task_queue) {
// enforce task alignment.
task_queue->InsertFence(TaskQueue::InsertFencePosition::BEGINNING_OF_TIME);
+ if (!task_queue->IsQueueEnabled())
+ return;
+
if (!task_queue->IsEmpty()) {
if (task_queue->HasPendingImmediateWork()) {
OnTimeDomainHasImmediateWork(task_queue);
@@ -397,6 +400,11 @@ void TaskQueueThrottler::OnTimeDomainHasImmediateWork(TaskQueue* queue) {
TRACE_EVENT0(tracing_category_,
"TaskQueueThrottler::OnTimeDomainHasImmediateWork");
+ // We don't expect this to get called for disabled queues, but we can't DCHECK
+ // because of the above thread hop. Just bail out if the queue is disabled.
+ if (!queue->IsQueueEnabled())
+ return;
+
base::TimeTicks now = tick_clock_->NowTicks();
base::TimeTicks next_allowed_run_time = GetNextAllowedRunTime(now, queue);
MaybeSchedulePumpThrottledTasks(FROM_HERE, now, next_allowed_run_time);
@@ -405,6 +413,7 @@ void TaskQueueThrottler::OnTimeDomainHasImmediateWork(TaskQueue* queue) {
void TaskQueueThrottler::OnTimeDomainHasDelayedWork(TaskQueue* queue) {
TRACE_EVENT0(tracing_category_,
"TaskQueueThrottler::OnTimeDomainHasDelayedWork");
+ DCHECK(queue->IsQueueEnabled());
base::TimeTicks now = tick_clock_->NowTicks();
LazyNow lazy_now(now);

Powered by Google App Engine
This is Rietveld 408576698