Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: include/core/SkTime.h

Issue 1420923003: Revert of SkTime::GetNSecs() (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/tools.gyp ('k') | src/animator/SkTime.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkTime_DEFINED 10 #ifndef SkTime_DEFINED
(...skipping 16 matching lines...) Expand all
27 uint8_t fDayOfWeek; //!< 0..6, 0==Sunday 27 uint8_t fDayOfWeek; //!< 0..6, 0==Sunday
28 uint8_t fDay; //!< 1..31 28 uint8_t fDay; //!< 1..31
29 uint8_t fHour; //!< 0..23 29 uint8_t fHour; //!< 0..23
30 uint8_t fMinute; //!< 0..59 30 uint8_t fMinute; //!< 0..59
31 uint8_t fSecond; //!< 0..59 31 uint8_t fSecond; //!< 0..59
32 32
33 void toISO8601(SkString* dst) const; 33 void toISO8601(SkString* dst) const;
34 }; 34 };
35 static void GetDateTime(DateTime*); 35 static void GetDateTime(DateTime*);
36 36
37 static SkMSec GetMSecs() { return (SkMSec)(GetNSecs() * 1e-6); } 37 static SkMSec GetMSecs();
38 static double GetNSecs();
39 }; 38 };
40 39
41 #if defined(SK_DEBUG) && defined(SK_BUILD_FOR_WIN32) 40 #if defined(SK_DEBUG) && defined(SK_BUILD_FOR_WIN32)
42 extern SkMSec gForceTickCount; 41 extern SkMSec gForceTickCount;
43 #endif 42 #endif
44 43
45 #define SK_TIME_FACTOR 1 44 #define SK_TIME_FACTOR 1
46 45
47 /////////////////////////////////////////////////////////////////////////////// 46 ///////////////////////////////////////////////////////////////////////////////
48 47
(...skipping 14 matching lines...) Expand all
63 } 62 }
64 } 63 }
65 private: 64 private:
66 const char* fLabel; 65 const char* fLabel;
67 SkMSec fNow; 66 SkMSec fNow;
68 SkMSec fMinToDump; 67 SkMSec fMinToDump;
69 }; 68 };
70 #define SkAutoTime(...) SK_REQUIRE_LOCAL_VAR(SkAutoTime) 69 #define SkAutoTime(...) SK_REQUIRE_LOCAL_VAR(SkAutoTime)
71 70
72 #endif 71 #endif
OLDNEW
« no previous file with comments | « gyp/tools.gyp ('k') | src/animator/SkTime.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698