A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

cc/frame_rate_counter.cc

 // Copyright 2012 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 "config.h"
 
 #include "cc/frame_rate_counter.h"
 
 #include <cmath>
 
 #include "base/metrics/histogram.h"
 #include "cc/proxy.h"
 
 namespace cc {
 
 const double FrameRateCounter::kFrameTooFast = 1.0 / 70.0; // measured in seconds
 const double FrameRateCounter::kFrameTooSlow = 1.0 / 12.0;
 const double FrameRateCounter::kDroppedFrameTime = 1.0 / 50.0;
 
 // safeMod works on -1, returning m-1 in that case.
 static inline int safeMod(int number, int modulus)
 {
     return (number + modulus) % modulus;
 }
 
 // static
-scoped_ptr<FrameRateCounter> FrameRateCounter::create(bool hasImplThread) {
-  return make_scoped_ptr(new FrameRateCounter(hasImplThread));
+scoped_ptr<FrameRateCounter> FrameRateCounter::create() {
+  return make_scoped_ptr(new FrameRateCounter());
 }
 
 inline base::TimeDelta FrameRateCounter::frameInterval(int frameNumber) const
 {
     return m_timeStampHistory[frameIndex(frameNumber)] -
         m_timeStampHistory[frameIndex(frameNumber - 1)];
 }
 
 inline int FrameRateCounter::frameIndex(int frameNumber) const
 {
     return safeMod(frameNumber, kTimeStampHistorySize);
 }
 
-FrameRateCounter::FrameRateCounter(bool hasImplThread)
-    : m_hasImplThread(hasImplThread)
-    , m_currentFrameNumber(1)
+FrameRateCounter::FrameRateCounter()
+    : m_currentFrameNumber(1)
     , m_droppedFrameCount(0)
 {
     m_timeStampHistory[0] = base::TimeTicks::Now();
     m_timeStampHistory[1] = m_timeStampHistory[0];
     for (int i = 2; i < kTimeStampHistorySize; i++)
         m_timeStampHistory[i] = base::TimeTicks();
 }
 
 void FrameRateCounter::markBeginningOfFrame(base::TimeTicks timestamp)
 {
     m_timeStampHistory[frameIndex(m_currentFrameNumber)] = timestamp;
     base::TimeDelta frameIntervalSeconds = frameInterval(m_currentFrameNumber);
 
-    if (m_hasImplThread && m_currentFrameNumber > 0) {
+    if (Proxy::hasImplThread() && m_currentFrameNumber > 0) {
         HISTOGRAM_CUSTOM_COUNTS("Renderer4.CompositorThreadImplDrawDelay", frameIntervalSeconds.InMilliseconds(), 1, 120, 60);
     }
 
     if (!isBadFrameInterval(frameIntervalSeconds) &&
         frameIntervalSeconds.InSecondsF() > kDroppedFrameTime)
         ++m_droppedFrameCount;
 }
 
 void FrameRateCounter::markEndOfFrame()
 {
     m_currentFrameNumber += 1;
 }
 
 bool FrameRateCounter::isBadFrameInterval(base::TimeDelta intervalBetweenConsecutiveFrames) const
 {
-    bool schedulerAllowsDoubleFrames = !m_hasImplThread;
+    bool schedulerAllowsDoubleFrames = !Proxy::hasImplThread();
     bool intervalTooFast = schedulerAllowsDoubleFrames && intervalBetweenConsecutiveFrames.InSecondsF() < kFrameTooFast;
     bool intervalTooSlow = intervalBetweenConsecutiveFrames.InSecondsF() > kFrameTooSlow;
     return intervalTooFast || intervalTooSlow;
 }
 
 bool FrameRateCounter::isBadFrame(int frameNumber) const
 {
     return isBadFrameInterval(frameInterval(frameNumber));
 }
 
@@ skipping 41 matching lines @@
 
 base::TimeTicks FrameRateCounter::timeStampOfRecentFrame(int n)
 {
     DCHECK(n >= 0);
     DCHECK(n < kTimeStampHistorySize);
     int desiredIndex = (frameIndex(m_currentFrameNumber) + n) % kTimeStampHistorySize;
     return m_timeStampHistory[desiredIndex];
 }
 
 }  // namespace cc
+