Support tracing metrics for measureTime & measureFrameTime method in blink_perf

third_party/WebKit/PerformanceTests/resources/runner.js

Index: third_party/WebKit/PerformanceTests/resources/runner.js
diff --git a/third_party/WebKit/PerformanceTests/resources/runner.js b/third_party/WebKit/PerformanceTests/resources/runner.js
index 22a5e8eadcce6f54b3ce7bc6bde46b2d979af781..5508ccb64430f9b0b6961596fe8e037cd9ed3703 100644
--- a/third_party/WebKit/PerformanceTests/resources/runner.js
+++ b/third_party/WebKit/PerformanceTests/resources/runner.js
@@ -157,8 +157,16 @@ if (window.testRunner) {
         PerfTestRunner.log("Running " + iterationCount + " times");
         if (test.doNotIgnoreInitialRun)
             completedIterations++;
-        if (runner)
+
+        if (runner && test.tracingCategories && window.testRunner &&
+            window.testRunner.supportTracing) {
+          window.testRunner.traceEventsToMeasure = test.traceEventsToMeasure;

[Xianzhu, 2017/04/21 01:31:51]

Nit: Use indentation (4) consistent with the original code. 

[nednguyen, 2017/04/24 20:55:21]

Done.

+          window.testRunner.startTracing(test.tracingCategories, function() {
+            scheduleNextRun(scheduler, runner);
+          });
+        } else if (runner) {
             scheduleNextRun(scheduler, runner);
+        }
     }
 
     function scheduleNextRun(scheduler, runner) {
@@ -248,6 +256,25 @@ if (window.testRunner) {
             finish();
     }
 
+    function addRunTestStartMarker() {
+      if (window.testRunner === undefined || !window.testRunner.supportTracing)

[Xianzhu, 2017/04/21 01:31:51]

Nit: !window.testRunner?

[nednguyen, 2017/04/24 20:55:21]

Done.

+        return;
+      if (completedIterations < 0)
+        console.time('blink_perf.runTest.warmup');
+      else
+        console.time('blink_perf.runTest');
+    }
+
+    function addRunTestEndMarker() {
+      if (window.testRunner === undefined || !window.testRunner.supportTracing)
+        return;
+      if (completedIterations < 0)
+        console.timeEnd('blink_perf.runTest.warmup');
+      else
+        console.timeEnd('blink_perf.runTest');
+    }
+
+
     PerfTestRunner.measureFrameTime = function (test) {
         PerfTestRunner.unit = "ms";
         PerfTestRunner.bufferedLog = true;
@@ -261,9 +288,12 @@ if (window.testRunner) {
 
     var lastFrameTime = -1;
     function measureFrameTimeOnce() {
+        if (lastFrameTime != -1)
+          addRunTestEndMarker();
         var now = PerfTestRunner.now();
         var result = lastFrameTime == -1 ? -1 : now - lastFrameTime;
         lastFrameTime = now;
+        addRunTestStartMarker();
 
         var returnValue = currentTest.run();
         if (returnValue - 0 === returnValue) {
@@ -290,7 +320,9 @@ if (window.testRunner) {
         PerfTestRunner.gc();
 
         var start = PerfTestRunner.now();
+        addRunTestStartMarker();
         var returnValue = currentTest.run();
+        addRunTestEndMarker();
         var end = PerfTestRunner.now();
 
         if (returnValue - 0 === returnValue) {