summaryrefslogtreecommitdiffstats
path: root/cc/frame_rate_counter.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 18:15:04 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 18:15:04 +0000
commit1d99317a73040007668b1cdf134334f45d45600e (patch)
tree0da28120111aa69a339ec90ff05d7cac8b21cf77 /cc/frame_rate_counter.cc
parent52f1a7e63128f2a4f644e1a28a6744b916585999 (diff)
downloadchromium_src-1d99317a73040007668b1cdf134334f45d45600e.zip
chromium_src-1d99317a73040007668b1cdf134334f45d45600e.tar.gz
chromium_src-1d99317a73040007668b1cdf134334f45d45600e.tar.bz2
cc: Switch to Chromium DCHECKs LOGs
We can't compile-guard code and use DCHECK since it can be enabled at runtime. So we guard the DCHECKs that we want to rely on conditionally-compiled code in !NDEBUG compile guards. This also replaces use of LOG_ERROR("Foo") with LOG(ERROR)<<"Foo"; This was previously discussed and committed as https://codereview.chromium.org/11048044/ using a guard based on LOGGING_IS_OFFICIAL_BUILD, however this was not sufficient since there are build configurations that are official builds but have dchecks compiled. R=enne Review URL: https://codereview.chromium.org/11192030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/frame_rate_counter.cc')
-rw-r--r--cc/frame_rate_counter.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/frame_rate_counter.cc b/cc/frame_rate_counter.cc
index 5f4fe03..ee10b81 100644
--- a/cc/frame_rate_counter.cc
+++ b/cc/frame_rate_counter.cc
@@ -125,7 +125,8 @@ void CCFrameRateCounter::getAverageFPSAndStandardDeviation(double& averageFPS, d
base::TimeTicks CCFrameRateCounter::timeStampOfRecentFrame(int n)
{
- ASSERT(n >= 0 && n < kTimeStampHistorySize);
+ DCHECK(n >= 0);
+ DCHECK(n < kTimeStampHistorySize);
int desiredIndex = (frameIndex(m_currentFrameNumber) + n) % kTimeStampHistorySize;
return m_timeStampHistory[desiredIndex];
}