Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1339435 - Fix bogus assertion in both profiler_time() variants. r=jseward.

Browse Source 
--HG--
extra : rebase_source : e752a0bf0b8ea8282bc8f0b477d178325e247397
This commit is contained in:
Nicholas Nethercote 2017-02-15 14:36:10 +11:00
parent 209be0e8ce
commit 912ba37deb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/profiler/core/platform.cpp
View File

@ -2477,7 +2477,7 @@ profiler_js_operation_callback()
double
profiler_time(const mozilla::TimeStamp& aTime)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
// This function runs both on and off the main thread.
mozilla::TimeDuration delta = aTime - gStartTime;
return delta.ToMilliseconds();
@ -2486,7 +2486,7 @@ profiler_time(const mozilla::TimeStamp& aTime)
double
profiler_time()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
// This function runs both on and off the main thread.
return profiler_time(mozilla::TimeStamp::Now());
}