Add synthetic delay points for latency testing

cc/resources/raster_worker_pool.cc

 // Copyright 2013 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.
 
 #include "cc/resources/raster_worker_pool.h"
 
+#include "base/debug/trace_event_synthetic_delay.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/traced_value.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/lazy_pixel_ref.h"
 #include "skia/ext/paint_simplifier.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ skipping 11 matching lines @@
     return true;
   }
  private:
   void* buffer_;
 };
 
 // Flag to indicate whether we should try and detect that
 // a tile is of solid color.
 const bool kUseColorEstimator = true;
 
+// Synthetic delay for raster tasks that are required for activation. Global to
+// avoid static initializer on critical path.
+struct RasterRequiredForActivationSyntheticDelayInitializer {
+  RasterRequiredForActivationSyntheticDelayInitializer()
+      : delay(base::debug::TraceEventSyntheticDelay::Lookup(
+                  "cc.RasterRequiredForActivation")) {}
+  base::debug::TraceEventSyntheticDelay* delay;
+};
+static base::LazyInstance<RasterRequiredForActivationSyntheticDelayInitializer>
+    g_raster_required_for_activation_delay = LAZY_INSTANCE_INITIALIZER;
+
 class DisableLCDTextFilter : public SkDrawFilter {
  public:
   // SkDrawFilter interface.
   virtual bool filter(SkPaint* paint, SkDrawFilter::Type type) OVERRIDE {
     if (type != SkDrawFilter::kText_Type)
       return true;
 
     paint->setLCDRenderText(false);
     return true;
   }
@@ skipping 251 matching lines @@
   // Overridden from internal::WorkerPoolTask:
   virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {
     TRACE_EVENT0("cc", "RasterFinishedWorkerPoolTaskImpl::RunOnWorkerThread");
     origin_loop_->PostTask(
         FROM_HERE,
         base::Bind(&RasterFinishedWorkerPoolTaskImpl::RunOnOriginThread,
                    this));
   }
   virtual void CompleteOnOriginThread() OVERRIDE {}
 
- private:
+ protected:
   virtual ~RasterFinishedWorkerPoolTaskImpl() {}
 
+ private:
   void RunOnOriginThread() const {
     on_raster_finished_callback_.Run(this);
   }
 
   scoped_refptr<base::MessageLoopProxy> origin_loop_;
   const Callback on_raster_finished_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterFinishedWorkerPoolTaskImpl);
 };
 
+class RasterRequiredForActivationFinishedWorkerPoolTaskImpl
+    : public RasterFinishedWorkerPoolTaskImpl {
+ public:
+  RasterRequiredForActivationFinishedWorkerPoolTaskImpl(
+      const Callback& on_raster_finished_callback,
+      bool has_tasks_required_for_activation)
+      : RasterFinishedWorkerPoolTaskImpl(on_raster_finished_callback),
+        has_tasks_required_for_activation_(has_tasks_required_for_activation) {
+    if (has_tasks_required_for_activation_) {
+      g_raster_required_for_activation_delay.Get().delay->BeginParallel(
+          &activation_delay_end_time_);
+    }
+  }
+
+  // Overridden from RasterFinishedWorkerPoolTaskImpl

[reveman, 2013/12/19 19:02:23]

nit: add a ":" at the end of this line 

+  virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {
+    TRACE_EVENT0("cc",
+                 "RasterRequiredForActivationFinishedWorkerPoolTaskImpl::"
+                 "RunOnWorkerThread");
+    if (has_tasks_required_for_activation_) {
+      g_raster_required_for_activation_delay.Get().delay->EndParallel(
+          activation_delay_end_time_);
+    }
+    RasterFinishedWorkerPoolTaskImpl::RunOnWorkerThread(thread_index);
+  }
+
+ private:
+  virtual ~RasterRequiredForActivationFinishedWorkerPoolTaskImpl() {}
+
+  base::TimeTicks activation_delay_end_time_;
+  const bool has_tasks_required_for_activation_;

[reveman, 2013/12/19 19:02:23]

nit: "size_t tasks_required_for_activation_count_" here too and have the details
of how this delay is implemented completely part of the
RasterRequiredForActivationFinishedWorkerPoolTaskImpl implementation.

+
+  DISALLOW_COPY_AND_ASSIGN(
+      RasterRequiredForActivationFinishedWorkerPoolTaskImpl);
+};
+
 const char* kWorkerThreadNamePrefix = "CompositorRaster";
 
 }  // namespace
 
 namespace internal {
 
 RasterWorkerPoolTask::RasterWorkerPoolTask(
     const Resource* resource, TaskVector* dependencies)
     : did_run_(false),
       did_complete_(false),
@@ skipping 167 matching lines @@
 
 scoped_refptr<internal::WorkerPoolTask>
     RasterWorkerPool::CreateRasterFinishedTask() {
   return make_scoped_refptr(
       new RasterFinishedWorkerPoolTaskImpl(
           base::Bind(&RasterWorkerPool::OnRasterFinished,
                      weak_ptr_factory_.GetWeakPtr())));
 }
 
 scoped_refptr<internal::WorkerPoolTask>
-    RasterWorkerPool::CreateRasterRequiredForActivationFinishedTask() {
+    RasterWorkerPool::CreateRasterRequiredForActivationFinishedTask(
+       size_t tasks_required_for_activation_count) {
   return make_scoped_refptr(
-      new RasterFinishedWorkerPoolTaskImpl(
+      new RasterRequiredForActivationFinishedWorkerPoolTaskImpl(
           base::Bind(&RasterWorkerPool::OnRasterRequiredForActivationFinished,
-                     weak_ptr_factory_.GetWeakPtr())));
+                     weak_ptr_factory_.GetWeakPtr()),
+          tasks_required_for_activation_count > 0u));
 }
 
 void RasterWorkerPool::OnRasterFinished(
     const internal::WorkerPoolTask* source) {
   TRACE_EVENT0("cc", "RasterWorkerPool::OnRasterFinished");
 
   // Early out if current |raster_finished_task_| is not the source.
   if (source != raster_finished_task_.get())
     return;
 
@@ skipping 63 matching lines @@
 
     internal::GraphNode* decode_node = CreateGraphNodeForTask(
         decode_task, priority, graph);
     decode_node->add_dependent(raster_node);
   }
 
   return raster_node;
 }
 
 }  // namespace cc