cc: add DevTools instrumentation for impl-side frames

cc/scheduler/scheduler.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SCHEDULER_SCHEDULER_H_
 #define CC_SCHEDULER_SCHEDULER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 42 matching lines @@
   virtual void DidBeginImplFrameDeadline() = 0;
 
  protected:
   virtual ~SchedulerClient() {}
 };
 
 class CC_EXPORT Scheduler {
  public:
   static scoped_ptr<Scheduler> Create(
       SchedulerClient* client,
-      const SchedulerSettings& scheduler_settings) {
-    return make_scoped_ptr(new Scheduler(client,  scheduler_settings));
+      const SchedulerSettings& scheduler_settings,
+      int tree_id) {
+    return make_scoped_ptr(new Scheduler(client, scheduler_settings, tree_id));
   }
 
   virtual ~Scheduler();
 
   void SetCanStart();
 
   void SetVisible(bool visible);
   void SetCanDraw(bool can_draw);
   void NotifyReadyToActivate();
 
@@ skipping 42 matching lines @@
   scoped_ptr<base::Value> StateAsValue() {
     return state_machine_.AsValue().Pass();
   }
 
   bool IsInsideAction(SchedulerStateMachine::Action action) {
     return inside_action_ == action;
   }
 
  private:
   Scheduler(SchedulerClient* client,
-            const SchedulerSettings& scheduler_settings);
+            const SchedulerSettings& scheduler_settings,
+            int tree_id);
 
   void PostBeginImplFrameDeadline(base::TimeTicks deadline);
   void SetupNextBeginImplFrameIfNeeded();
   void ActivatePendingTree();
   void DrawAndSwapIfPossible();
   void DrawAndSwapForced();
   void DrawAndReadback();
   void ProcessScheduledActions();
 
   const SchedulerSettings settings_;
   SchedulerClient* client_;
+  int tree_id_;

[nduca, 2013/11/06 19:05:12]

can we call this layer_tree_host_id throughout? We actually have LayerTrees
which are different than the hosts...

[caseq, 2013/11/07 06:36:26]

Sure, done (everywhere except devtools_instrumentation, where we were already
using it, as it should match the parameter name on the blink side).

 
   bool last_set_needs_begin_impl_frame_;
   BeginFrameArgs last_begin_impl_frame_args_;
   base::CancelableClosure begin_impl_frame_deadline_closure_;
   base::CancelableClosure poll_for_draw_triggers_closure_;
 
   SchedulerStateMachine state_machine_;
   bool inside_process_scheduled_actions_;
   SchedulerStateMachine::Action inside_action_;
 
   base::WeakPtrFactory<Scheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Scheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_H_