Fixit: Fork base::TimeTicks --> TimeTicks + ThreadTicks + TraceTicks

cc/debug/rendering_stats_instrumentation.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/debug/rendering_stats_instrumentation.h"
 
 namespace cc {
 
 // static
 scoped_ptr<RenderingStatsInstrumentation>
@@ skipping 19 matching lines @@
   rendering_stats.Add(impl_thread_rendering_stats_);
   return rendering_stats;
 }
 
 void RenderingStatsInstrumentation::AccumulateAndClearImplThreadStats() {
   base::AutoLock scoped_lock(lock_);
   impl_thread_rendering_stats_accu_.Add(impl_thread_rendering_stats_);
   impl_thread_rendering_stats_ = RenderingStats();
 }
 
-base::TimeTicks RenderingStatsInstrumentation::StartRecording() const {
+base::TimeDelta RenderingStatsInstrumentation::StartRecording() const {
   if (record_rendering_stats_) {
-    if (base::TimeTicks::IsThreadNowSupported())
-      return base::TimeTicks::ThreadNow();
-    return base::TimeTicks::Now();
+    if (base::ThreadTicks::IsSupported())
+      return base::ThreadTicks::Now() - base::ThreadTicks();
+    return base::TimeTicks::Now() - base::TimeTicks();
   }
-  return base::TimeTicks();
+  return base::TimeDelta();
 }
 
 base::TimeDelta RenderingStatsInstrumentation::EndRecording(
-    base::TimeTicks start_time) const {
-  if (!start_time.is_null()) {
-    if (base::TimeTicks::IsThreadNowSupported())
-      return base::TimeTicks::ThreadNow() - start_time;
-    return base::TimeTicks::Now() - start_time;
+    base::TimeDelta start_time) const {
+  if (start_time != base::TimeDelta()) {
+    if (base::ThreadTicks::IsSupported())
+      return (base::ThreadTicks::Now() - base::ThreadTicks()) - start_time;
+    return (base::TimeTicks::Now() - base::TimeTicks()) - start_time;
   }
   return base::TimeDelta();
 }
 
 void RenderingStatsInstrumentation::IncrementFrameCount(int64 count) {
   if (!record_rendering_stats_)
     return;
 
   base::AutoLock scoped_lock(lock_);
   impl_thread_rendering_stats_.frame_count += count;
@@ skipping 57 matching lines @@
     return;
 
   base::AutoLock scoped_lock(lock_);
   impl_thread_rendering_stats_.commit_to_activate_duration.Append(
       commit_to_activate_duration);
   impl_thread_rendering_stats_.commit_to_activate_duration_estimate.Append(
       commit_to_activate_duration_estimate);
 }
 
 }  // namespace cc