summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-24 20:17:24 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-24 20:17:24 +0000
commit909c0bff46195e9fcab5e80f8c1ba6891028429e (patch)
treeac5e6bbd192ba07296c3fd601ea82db217f77e94 /core
parentc8757fdc02fa75c52352b02e576fdf338063463d (diff)
downloadinclude-909c0bff46195e9fcab5e80f8c1ba6891028429e.tar.gz
Revert of Add nanosecond timer. (https://codereview.chromium.org/250243002/)
Reason for revert: breaks EVERYTHING Original issue's description: > Add nanosecond timer. > > I've been finding it hard to get enough resolution out of our existing timers when measuring really tiny pictures. > > BUG=skia:2378 > > Committed: http://code.google.com/p/skia/source/detail?r=14362 R=bsalomon@google.com, bungeman@google.com, mtklein@chromium.org TBR=bsalomon@google.com, bungeman@google.com, mtklein@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia:2378 Author: mtklein@google.com Review URL: https://codereview.chromium.org/258703002 git-svn-id: http://skia.googlecode.com/svn/trunk/include@14364 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'core')
-rw-r--r--core/SkTime.h4
-rw-r--r--core/SkTypes.h4
2 files changed, 1 insertions, 7 deletions
diff --git a/core/SkTime.h b/core/SkTime.h
index c4a7d06..51616d4 100644
--- a/core/SkTime.h
+++ b/core/SkTime.h
@@ -28,9 +28,7 @@ public:
};
static void GetDateTime(DateTime*);
- static SkMSec GetMSecs() { return GetNSecs() / 1000000; }
-
- static SkNSec GetNSecs();
+ static SkMSec GetMSecs();
};
#if defined(SK_DEBUG) && defined(SK_BUILD_FOR_WIN32)
diff --git a/core/SkTypes.h b/core/SkTypes.h
index 3a512ab..13450cd 100644
--- a/core/SkTypes.h
+++ b/core/SkTypes.h
@@ -315,10 +315,6 @@ typedef uint32_t SkMSec;
*/
#define SkMSec_LE(a, b) ((int32_t)(a) - (int32_t)(b) <= 0)
-/** 64 bit value to hold nanosecond count
-*/
-typedef uint64_t SkNSec;
-
/** The generation IDs in Skia reserve 0 has an invalid marker.
*/
#define SK_InvalidGenID 0