diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-07-06 15:53:52 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-07-06 15:53:52 +0200 |
| commit | 941e54654eabed0a3568f7fefe424a45aa02eddb (patch) | |
| tree | 49aa02b174c428962d99142d8061267bfcd79e69 /mozglue/misc/TimeStamp.h | |
| parent | ad9ee72dcd7981bc47b3844a224d69fadfdfd8ef (diff) | |
| parent | 0daa12376295d5d796256a116eb2a348a3a9273f (diff) | |
| download | UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.gz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.lz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.xz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into _testBranch_test_1
Diffstat (limited to 'mozglue/misc/TimeStamp.h')
| -rw-r--r-- | mozglue/misc/TimeStamp.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h index a1a0eb360..6a4f0b810 100644 --- a/mozglue/misc/TimeStamp.h +++ b/mozglue/misc/TimeStamp.h @@ -216,10 +216,7 @@ public: } double operator/(const BaseTimeDuration& aOther) const { -#ifndef MOZ_B2G - // Bug 1066388 - This fails on B2G ICS Emulator MOZ_ASSERT(aOther.mValue != 0, "Division by zero"); -#endif return ValueCalculator::DivideDouble(mValue, aOther.mValue); } BaseTimeDuration operator%(const BaseTimeDuration& aOther) const @@ -403,11 +400,11 @@ public: * retrieved by mozilla::TimeStamp. Since we need this for * vsync timestamps, we enable the creation of mozilla::TimeStamps * on platforms that support vsync aligned refresh drivers / compositors - * Verified true as of Jan 31, 2015: B2G and OS X + * Verified true as of Jan 31, 2015: OS X * False on Windows 7 * UNTESTED ON OTHER PLATFORMS */ -#if defined(MOZ_WIDGET_GONK) || defined(XP_DARWIN) +#if defined(XP_DARWIN) static TimeStamp FromSystemTime(int64_t aSystemTime) { static_assert(sizeof(aSystemTime) == sizeof(TimeStampValue), |