Index: tools/timer/Timer.cpp |
diff --git a/tools/timer/Timer.cpp b/tools/timer/Timer.cpp |
index e430404b3d7836d622bb45d734b7c9a8a45420a0..b59988ca2642f5f3330d05ba849cdde8c4c49e0d 100644 |
--- a/tools/timer/Timer.cpp |
+++ b/tools/timer/Timer.cpp |
@@ -53,12 +53,13 @@ void WallTimer::end() { |
} |
SkString HumanizeMs(double ms) { |
- if (ms > 1e+3) return SkStringPrintf("%.3gs", ms/1e3); |
- if (ms < 1e-3) return SkStringPrintf("%.3gns", ms*1e6); |
+ if (ms > 60e+3) return SkStringPrintf("%.3gm", ms/60e+3); |
+ if (ms > 1e+3) return SkStringPrintf("%.3gs", ms/1e+3); |
+ if (ms < 1e-3) return SkStringPrintf("%.3gns", ms*1e+6); |
#ifdef SK_BUILD_FOR_WIN |
- if (ms < 1) return SkStringPrintf("%.3gus", ms*1e3); |
+ if (ms < 1) return SkStringPrintf("%.3gus", ms*1e+3); |
#else |
- if (ms < 1) return SkStringPrintf("%.3gµs", ms*1e3); |
+ if (ms < 1) return SkStringPrintf("%.3gµs", ms*1e+3); |
#endif |
return SkStringPrintf("%.3gms", ms); |
} |