| Index: cc/base/histograms.cc
|
| diff --git a/cc/base/histograms.cc b/cc/base/histograms.cc
|
| index af1ea661a89569d6f4e09208d9e784a388340ae7..8b284d9c72189efd5b86d57ac64b6dfbf1e44e74 100644
|
| --- a/cc/base/histograms.cc
|
| +++ b/cc/base/histograms.cc
|
| @@ -5,9 +5,9 @@
|
| #include "cc/base/histograms.h"
|
|
|
| #include <algorithm>
|
| +#include <cmath>
|
| #include <limits>
|
|
|
| -#include "base/float_util.h"
|
| #include "base/numerics/safe_conversions.h"
|
|
|
| namespace cc {
|
| @@ -38,7 +38,7 @@ void ScopedUMAHistogramAreaTimerBase::GetHistogramValues(
|
| elapsed = std::max(
|
| elapsed, base::TimeDelta::FromMicroseconds(kMinimumTimeMicroseconds));
|
| double area_per_time = area / elapsed.InMillisecondsF();
|
| - DCHECK(!base::IsNaN(area_per_time));
|
| + DCHECK(!std::isnan(area_per_time));
|
| *time_microseconds = base::saturated_cast<Sample>(elapsed.InMicroseconds());
|
| *pixels_per_ms = base::saturated_cast<Sample>(area_per_time);
|
| }
|
|
|