cc: add more devtools instrumentation

cc/trees/thread_proxy.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_TREES_THREAD_PROXY_H_
 #define CC_TREES_THREAD_PROXY_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 149 matching lines @@
   void ForceCommitForReadbackOnImplThread(
       CompletionEvent* begin_main_frame_sent_completion,
       ReadbackRequest* request);
   void StartCommitOnImplThread(
       CompletionEvent* completion,
       ResourceUpdateQueue* queue,
       scoped_refptr<ContextProvider> offscreen_context_provider);
   void BeginMainFrameAbortedOnImplThread(bool did_handle);
   void RequestReadbackOnImplThread(ReadbackRequest* request);
   void FinishAllRenderingOnImplThread(CompletionEvent* completion);
-  void InitializeImplOnImplThread(CompletionEvent* completion,
-                                  int layer_tree_host_id);
+  void InitializeImplOnImplThread(CompletionEvent* completion);
   void SetLayerTreeHostClientReadyOnImplThread();
   void SetVisibleOnImplThread(CompletionEvent* completion, bool visible);
   void UpdateBackgroundAnimateTicking();
   void HasInitializedOutputSurfaceOnImplThread(
       CompletionEvent* completion,
       bool* has_initialized_output_surface);
   void InitializeOutputSurfaceOnImplThread(
       CompletionEvent* completion,
       scoped_ptr<OutputSurface> output_surface,
       scoped_refptr<ContextProvider> offscreen_context_provider,
@@ skipping 64 matching lines @@
     LayerTreeHost* layer_tree_host;
     bool commit_waits_for_activation;
     bool main_thread_inside_commit;
   };
   // Use accessors instead of this variable directly.
   MainThreadOrBlockedMainThread main_thread_or_blocked_vars_unsafe_;
   MainThreadOrBlockedMainThread& blocked_main();
   const MainThreadOrBlockedMainThread& blocked_main() const;
 
   struct CompositorThreadOnly {
-    explicit CompositorThreadOnly(ThreadProxy* proxy);
+    CompositorThreadOnly(ThreadProxy* proxy, int layer_tree_host_id);
     ~CompositorThreadOnly();
 
+    const int layer_tree_host_id;
+
     // Copy of the main thread side contents texture manager for work
     // that needs to be done on the compositor thread.
     PrioritizedResourceManager* contents_texture_manager;
 
     scoped_ptr<Scheduler> scheduler;
 
     // Set when the main thread is waiting on a
     // ScheduledActionSendBeginMainFrame to be issued.
     CompletionEvent* begin_main_frame_sent_completion_event;
 
@@ skipping 42 matching lines @@
 
   base::WeakPtr<ThreadProxy> main_thread_weak_ptr_;
   base::WeakPtr<ThreadProxy> impl_thread_weak_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadProxy);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_THREAD_PROXY_H_