Chromium Code Reviews| Index: cc/scheduler/scheduler.cc |
| diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc |
| index 70d726d42bc971026ecd426e82c29e4697fd744e..3b20b7983aac737cf1fb474b59e2cfd5938857dc 100644 |
| --- a/cc/scheduler/scheduler.cc |
| +++ b/cc/scheduler/scheduler.cc |
| @@ -380,8 +380,7 @@ bool Scheduler::OnBeginFrameMixInDelegate(const BeginFrameArgs& args) { |
| TRACE_EVENT1("cc,benchmark", "Scheduler::BeginFrame", "args", args.AsValue()); |
| // Deliver BeginFrames to children. |
| - if (settings_.forward_begin_frames_to_children && |
| - state_machine_.children_need_begin_frames()) { |
| + if (state_machine_.children_need_begin_frames()) { |
|
danakj
2015/03/13 17:57:11
If this patch isn't enabling stuff, but it's alrea
simonhong
2015/03/17 16:11:34
Yep, this is removed in a separate cl.
|
| BeginFrameArgs adjusted_args_for_children(args); |
| // Adjust a deadline for child schedulers. |
| // TODO(simonhong): Once we have commitless update, we can get rid of |
| @@ -431,7 +430,6 @@ bool Scheduler::OnBeginFrameMixInDelegate(const BeginFrameArgs& args) { |
| } |
| void Scheduler::SetChildrenNeedBeginFrames(bool children_need_begin_frames) { |
| - DCHECK(settings_.forward_begin_frames_to_children); |
| state_machine_.SetChildrenNeedBeginFrames(children_need_begin_frames); |
| ProcessScheduledActions(); |
| } |