summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-03-10 09:36:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-10 16:37:09 +0000
commit80c74faaa11dab9cf52a9832bc3bdae0b86bf610 (patch)
tree9f1446388b4c4233a0ba2d7f4b154bd3ac254d44
parentbef185684962bfeb4ce814c0e3a0c46a1cb9c4e0 (diff)
downloadchromium_src-80c74faaa11dab9cf52a9832bc3bdae0b86bf610.zip
chromium_src-80c74faaa11dab9cf52a9832bc3bdae0b86bf610.tar.gz
chromium_src-80c74faaa11dab9cf52a9832bc3bdae0b86bf610.tar.bz2
scheduler: Fix debug build crash with --disable-blink-scheduler
TEST=out/Debug/chrome --disable-blink-scheduler Review URL: https://codereview.chromium.org/994983002 Cr-Commit-Position: refs/heads/master@{#319897}
-rw-r--r--content/renderer/scheduler/single_thread_idle_task_runner.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/renderer/scheduler/single_thread_idle_task_runner.cc b/content/renderer/scheduler/single_thread_idle_task_runner.cc
index b6eb5ce..cb3db7d 100644
--- a/content/renderer/scheduler/single_thread_idle_task_runner.cc
+++ b/content/renderer/scheduler/single_thread_idle_task_runner.cc
@@ -16,8 +16,10 @@ SingleThreadIdleTaskRunner::SingleThreadIdleTaskRunner(
: idle_priority_task_runner_(idle_priority_task_runner),
after_wakeup_task_runner_(after_wakeup_task_runner),
deadline_supplier_(deadline_supplier) {
- DCHECK(idle_priority_task_runner_->RunsTasksOnCurrentThread());
- DCHECK(after_wakeup_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(!idle_priority_task_runner_ ||
+ idle_priority_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(!after_wakeup_task_runner_ ||
+ after_wakeup_task_runner_->RunsTasksOnCurrentThread());
}
SingleThreadIdleTaskRunner::~SingleThreadIdleTaskRunner() {