Don't adjust deadline for children BeginFrames

cc/scheduler/scheduler.cc

Index: cc/scheduler/scheduler.cc
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
index 5ffd59c095e62e1c67acc15acf582acdb3ce0f2c..200ab25133efd232be00f3c413d29d474d008513 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc
@@ -340,23 +340,13 @@ void Scheduler::SetupPollingMechanisms() {
 bool Scheduler::OnBeginFrameMixInDelegate(const BeginFrameArgs& args) {
   TRACE_EVENT1("cc,benchmark", "Scheduler::BeginFrame", "args", args.AsValue());
 
-  // Deliver BeginFrames to children.
-  if (state_machine_.children_need_begin_frames()) {
-    BeginFrameArgs adjusted_args_for_children(args);
-    // Adjust a deadline for child schedulers.
-    // TODO(simonhong): Once we have commitless update, we can get rid of
-    // BeginMainFrameToCommitDurationEstimate() +
-    // CommitToActivateDurationEstimate().
-    adjusted_args_for_children.deadline -=
-        (client_->BeginMainFrameToCommitDurationEstimate() +
-         client_->CommitToActivateDurationEstimate() +
-         client_->DrawDurationEstimate() + EstimatedParentDrawTime());
-    client_->SendBeginFramesToChildren(adjusted_args_for_children);
-  }
-
   BeginFrameArgs adjusted_args(args);
   adjusted_args.deadline -= EstimatedParentDrawTime();
 
+  // Deliver BeginFrames to children.
+  if (state_machine_.children_need_begin_frames())
+    client_->SendBeginFramesToChildren(adjusted_args);

[sunnyps, 2015/05/05 01:00:41]

Can you add a TODO get rid of this deadline adjustment too? Ideally the display
scheduler should decide what the deadline for a given client is.

[brianderson, 2015/05/05 01:53:29]

Done.

+
   if (settings_.using_synchronous_renderer_compositor) {
     BeginImplFrameSynchronous(adjusted_args);
     return true;