diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 20:32:53 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 20:32:53 +0000 |
| commit | 97f706cbef77c8b5fae821ecf2bc990def9b99f0 (patch) | |
| tree | 33fd6b04d5ed083a2b82c817467240dd1d0d1009 /webkit | |
| parent | 3f0b679e7d5ed5d91d128a6c600cfc58c3fc9fe5 (diff) | |
| download | chromium_src-97f706cbef77c8b5fae821ecf2bc990def9b99f0.zip chromium_src-97f706cbef77c8b5fae821ecf2bc990def9b99f0.tar.gz chromium_src-97f706cbef77c8b5fae821ecf2bc990def9b99f0.tar.bz2 | |
Fix resolution of GetTimeTicks.
Add a test to make sure Time and TimeTicks return increasing times. A similar test is failing in NaCl when I try to roll DEPS.
BUG=88935
TEST=test_core.cc
Review URL: http://codereview.chromium.org/7329047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/time_conversion.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/ppapi/time_conversion.cc b/webkit/plugins/ppapi/time_conversion.cc index d5f1282..089d009 100644 --- a/webkit/plugins/ppapi/time_conversion.cc +++ b/webkit/plugins/ppapi/time_conversion.cc @@ -35,8 +35,8 @@ base::Time PPTimeToTime(PP_Time t) { } PP_TimeTicks TimeTicksToPPTimeTicks(base::TimeTicks t) { - return static_cast<double>(t.ToInternalValue() / - base::Time::kMicrosecondsPerSecond); + return static_cast<double>(t.ToInternalValue()) / + base::Time::kMicrosecondsPerSecond; } PP_TimeTicks EventTimeToPPTimeTicks(double event_time) { |