aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/timer
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2015-01-15 10:15:02 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-15 10:15:02 -0800
commit114c3cd0543d77aa0ac08d8af436ac7f9d32714d (patch)
tree4735fb4a5cdcfcfecfc48ff8e12ad185ceb3926d /tools/timer
parentc563172f530b5872d725d084d941f14c130d8116 (diff)
Revert of Sketch DM refactor. (patchset #45 id:850001 of https://codereview.chromium.org/788243008/)
Reason for revert: plenty of data Original issue's description: > Sketch DM refactor. > > BUG=skia:3255 > > > I think this supports everything DM used to, but has completely refactored how > it works to fit the design in the bug. > > Configs like "tiles-gpu" are automatically wired up. > > I wouldn't suggest looking at this as a diff. There's just a bunch of deleted > files, a few new files, and one new file that shares a name with a deleted file > (DM.cpp). > > NOTREECHECKS=true > > Committed: https://skia.googlesource.com/skia/+/709d2c3e5062c5b57f91273bfc11a751f5b2bb88 TBR=bsalomon@google.com,mtklein@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia:3255 Review URL: https://codereview.chromium.org/853883004
Diffstat (limited to 'tools/timer')
-rw-r--r--tools/timer/Timer.cpp11
-rw-r--r--tools/timer/Timer.h3
2 files changed, 0 insertions, 14 deletions
diff --git a/tools/timer/Timer.cpp b/tools/timer/Timer.cpp
index e430404b3d..a9f04afe75 100644
--- a/tools/timer/Timer.cpp
+++ b/tools/timer/Timer.cpp
@@ -51,14 +51,3 @@ void WallTimer::start() {
void WallTimer::end() {
fWall = fSysTimer.endWall();
}
-
-SkString HumanizeMs(double ms) {
- if (ms > 1e+3) return SkStringPrintf("%.3gs", ms/1e3);
- if (ms < 1e-3) return SkStringPrintf("%.3gns", ms*1e6);
-#ifdef SK_BUILD_FOR_WIN
- if (ms < 1) return SkStringPrintf("%.3gus", ms*1e3);
-#else
- if (ms < 1) return SkStringPrintf("%.3gµs", ms*1e3);
-#endif
- return SkStringPrintf("%.3gms", ms);
-}
diff --git a/tools/timer/Timer.h b/tools/timer/Timer.h
index e28a515b54..81d1ca50ef 100644
--- a/tools/timer/Timer.h
+++ b/tools/timer/Timer.h
@@ -8,7 +8,6 @@
#define Timer_DEFINED
#include "SkTypes.h"
-#include "SkString.h"
#if defined(SK_BUILD_FOR_WIN32)
#include "SysTimer_windows.h"
@@ -71,6 +70,4 @@ private:
SysTimer fSysTimer;
};
-SkString HumanizeMs(double);
-
#endif