cc:: Add RenderingStatsInstrumentation to manage collection of RenderingStats

cc/worker_pool.cc

Index: cc/worker_pool.cc
diff --git a/cc/worker_pool.cc b/cc/worker_pool.cc
index 6624bf3a509e5d701c05f7c896d2d7d2dcae948b..4085df1a8c4165f6191128f0cc83a443f73f9a82 100644
--- a/cc/worker_pool.cc
+++ b/cc/worker_pool.cc
@@ -9,7 +9,6 @@
 #include "base/stringprintf.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/threading/simple_thread.h"
-#include "cc/rendering_stats.h"
 
 #if defined(OS_ANDROID)
 // TODO(epenner): Move thread priorities to base. (crbug.com/170549)
@@ -31,8 +30,8 @@ class WorkerPoolTaskImpl : public internal::WorkerPoolTask {
 
   virtual void WillRunOnThread(unsigned thread_index) OVERRIDE {}
 
-  virtual void Run(RenderingStats* rendering_stats) OVERRIDE {
-    task_.Run(rendering_stats);
+  virtual void Run() OVERRIDE {
+    task_.Run();
   }
 
  private:
@@ -68,10 +67,6 @@ class WorkerPool::Inner : public base::DelegateSimpleThread::Delegate {
 
   void Shutdown();
 
-  void SetRecordRenderingStats(bool record_rendering_stats);
-
-  void GetRenderingStats(RenderingStats* stats);
-
   void PostTask(scoped_ptr<internal::WorkerPoolTask> task);
 
   // Appends all completed tasks to worker pool's completed tasks queue
@@ -146,8 +141,6 @@ class WorkerPool::Inner : public base::DelegateSimpleThread::Delegate {
   TaskDeque pending_tasks_;
   TaskDeque completed_tasks_;
 
-  scoped_ptr<RenderingStats> rendering_stats_;
-
   ScopedPtrDeque<base::DelegateSimpleThread> workers_;
 
   DISALLOW_COPY_AND_ASSIGN(Inner);
@@ -217,22 +210,6 @@ void WorkerPool::Inner::Shutdown() {
   }
 }
 
-void WorkerPool::Inner::SetRecordRenderingStats(bool record_rendering_stats) {
-  base::AutoLock lock(lock_);
-
-  if (record_rendering_stats)
-    rendering_stats_.reset(new RenderingStats);
-  else
-    rendering_stats_.reset();
-}
-
-void WorkerPool::Inner::GetRenderingStats(RenderingStats* stats) {
-  base::AutoLock lock(lock_);
-
-  if (rendering_stats_)
-    stats->Add(*rendering_stats_);
-}
-
 void WorkerPool::Inner::PostTask(scoped_ptr<internal::WorkerPoolTask> task) {
   base::AutoLock lock(lock_);
 
@@ -274,18 +251,13 @@ bool WorkerPool::Inner::RunCheapTasksUntilTimeLimit(
       break;
     }
 
-    scoped_ptr<RenderingStats> rendering_stats;
-    // Collect rendering stats if |rendering_stats_| is set.
-    if (rendering_stats_)
-      rendering_stats = make_scoped_ptr(new RenderingStats);
-
     // Increment |running_task_count_| before starting to run task.
     running_task_count_++;
 
     {
       base::AutoUnlock unlock(lock_);
 
-      task->Run(rendering_stats.get());
+      task->Run();
 
       // Append tasks directly to worker pool's completed tasks queue.
       worker_pool_on_origin_thread_->completed_tasks_.push_back(task.Pass());
@@ -293,10 +265,6 @@ bool WorkerPool::Inner::RunCheapTasksUntilTimeLimit(
         worker_pool_on_origin_thread_->OnTaskCompleted();
     }
 
-    // Add rendering stat results to |rendering_stats_|.
-    if (rendering_stats && rendering_stats_)
-      rendering_stats_->Add(*rendering_stats);
-
     // Decrement |running_task_count_| now that we are done running task.
     running_task_count_--;
   }
@@ -397,11 +365,6 @@ void WorkerPool::Inner::Run() {
       // Get next task.
       scoped_ptr<internal::WorkerPoolTask> task = pending_tasks_.take_front();
 
-      scoped_ptr<RenderingStats> rendering_stats;
-      // Collect rendering stats if |rendering_stats_| is set.
-      if (rendering_stats_)
-        rendering_stats = make_scoped_ptr(new RenderingStats);
-
       // Increment |running_task_count_| before starting to run task.
       running_task_count_++;
 
@@ -413,15 +376,11 @@ void WorkerPool::Inner::Run() {
         base::AutoUnlock unlock(lock_);
 
         task->WillRunOnThread(thread_index);
-        task->Run(rendering_stats.get());
+        task->Run();
       }
 
       completed_tasks_.push_back(task.Pass());
 
-      // Add rendering stat results to |rendering_stats_|.
-      if (rendering_stats && rendering_stats_)
-        rendering_stats_->Add(*rendering_stats);
-
       // Decrement |running_task_count_| now that we are done running task.
       running_task_count_--;
 
@@ -485,14 +444,6 @@ void WorkerPool::SetRunCheapTasksTimeLimit(
   ScheduleRunCheapTasks();
 }
 
-void WorkerPool::SetRecordRenderingStats(bool record_rendering_stats) {
-  inner_->SetRecordRenderingStats(record_rendering_stats);
-}
-
-void WorkerPool::GetRenderingStats(RenderingStats* stats) {
-  inner_->GetRenderingStats(stats);
-}
-
 void WorkerPool::OnIdle() {
   TRACE_EVENT0("cc", "WorkerPool::OnIdle");