Bug 1397307 - P4. Fix style. r?gerald draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 12 Sep 2017 11:09:15 +0200
changeset 665094 36a9070518e94a9aca2c9c58e5a7c045fb4a1742
parent 665093 6d9ef1c542637b6b191389d5c419da1cad812cca
child 665095 992e96056ca923da12df20b765e44717cf894a1f
push id79919
push userbmo:jyavenard@mozilla.com
push dateThu, 14 Sep 2017 22:16:27 +0000
reviewersgerald
bugs1397307
milestone57.0a1
Bug 1397307 - P4. Fix style. r?gerald MozReview-Commit-ID: 1Q3kwsDlAhI
dom/media/TimeUnits.h
--- a/dom/media/TimeUnits.h
+++ b/dom/media/TimeUnits.h
@@ -35,19 +35,21 @@ static const int64_t USECS_PER_MS = 1000
 
 namespace media {
 
 // Number of nanoseconds per second. 1e9.
 static const int64_t NSECS_PER_S = 1000000000;
 
 // TimeUnit at present uses a CheckedInt64 as storage.
 // INT64_MAX has the special meaning of being +oo.
-class TimeUnit final {
+class TimeUnit final
+{
 public:
-  static TimeUnit FromSeconds(double aValue) {
+  static TimeUnit FromSeconds(double aValue)
+  {
     MOZ_ASSERT(!IsNaN(aValue));
 
     if (mozilla::IsInfinite<double>(aValue)) {
       return FromInfinity();
     }
     // Due to internal double representation, this
     // operation is not commutative, do not attempt to simplify.
     double val = (aValue + .0000005) * USECS_PER_S;
@@ -55,150 +57,148 @@ public:
       return FromMicroseconds(INT64_MAX);
     } else if (val <= double(INT64_MIN)) {
       return FromMicroseconds(INT64_MIN);
     } else {
       return FromMicroseconds(int64_t(val));
     }
   }
 
-  static constexpr TimeUnit FromMicroseconds(int64_t aValue) {
+  static constexpr TimeUnit FromMicroseconds(int64_t aValue)
+  {
     return TimeUnit(aValue);
   }
 
-  static constexpr TimeUnit FromNanoseconds(int64_t aValue) {
+  static constexpr TimeUnit FromNanoseconds(int64_t aValue)
+  {
     return TimeUnit(aValue / 1000);
   }
 
-  static constexpr TimeUnit FromInfinity() {
-    return TimeUnit(INT64_MAX);
-  }
+  static constexpr TimeUnit FromInfinity() { return TimeUnit(INT64_MAX); }
 
-  static TimeUnit FromTimeDuration(const TimeDuration& aDuration) {
+  static TimeUnit FromTimeDuration(const TimeDuration& aDuration)
+  {
     return FromSeconds(aDuration.ToSeconds());
   }
 
-  static constexpr TimeUnit Zero() {
-    return TimeUnit(0);
-  }
+  static constexpr TimeUnit Zero() { return TimeUnit(0); }
 
-  static TimeUnit Invalid() {
+  static TimeUnit Invalid()
+  {
     TimeUnit ret;
     ret.mValue = CheckedInt64(INT64_MAX);
     // Force an overflow to render the CheckedInt invalid.
     ret.mValue += 1;
     return ret;
   }
 
-  int64_t ToMicroseconds() const {
-    return mValue.value();
-  }
+  int64_t ToMicroseconds() const { return mValue.value(); }
 
-  int64_t ToNanoseconds() const {
-    return mValue.value() * 1000;
-  }
+  int64_t ToNanoseconds() const { return mValue.value() * 1000; }
 
-  double ToSeconds() const {
+  double ToSeconds() const
+  {
     if (IsInfinite()) {
       return PositiveInfinity<double>();
     }
     return double(mValue.value()) / USECS_PER_S;
   }
 
-  TimeDuration ToTimeDuration() const {
+  TimeDuration ToTimeDuration() const
+  {
     return TimeDuration::FromMicroseconds(mValue.value());
   }
 
-  bool IsInfinite() const {
-    return mValue.value() == INT64_MAX;
-  }
+  bool IsInfinite() const { return mValue.value() == INT64_MAX; }
+
+  bool IsPositive() const { return mValue.value() > 0; }
 
-  bool IsPositive() const {
-    return mValue.value() > 0;
-  }
+  bool IsNegative() const { return mValue.value() < 0; }
 
-  bool IsNegative() const {
-    return mValue.value() < 0;
-  }
-
-  bool operator == (const TimeUnit& aOther) const {
+  bool operator==(const TimeUnit& aOther) const
+  {
     MOZ_ASSERT(IsValid() && aOther.IsValid());
     return mValue.value() == aOther.mValue.value();
   }
-  bool operator != (const TimeUnit& aOther) const {
+  bool operator!=(const TimeUnit& aOther) const
+  {
     MOZ_ASSERT(IsValid() && aOther.IsValid());
     return mValue.value() != aOther.mValue.value();
   }
-  bool operator >= (const TimeUnit& aOther) const {
+  bool operator>=(const TimeUnit& aOther) const
+  {
     MOZ_ASSERT(IsValid() && aOther.IsValid());
     return mValue.value() >= aOther.mValue.value();
   }
-  bool operator > (const TimeUnit& aOther) const {
-    return !(*this <= aOther);
-  }
-  bool operator <= (const TimeUnit& aOther) const {
+  bool operator>(const TimeUnit& aOther) const { return !(*this <= aOther); }
+  bool operator<=(const TimeUnit& aOther) const
+  {
     MOZ_ASSERT(IsValid() && aOther.IsValid());
     return mValue.value() <= aOther.mValue.value();
   }
-  bool operator < (const TimeUnit& aOther) const {
-    return !(*this >= aOther);
-  }
-  TimeUnit operator + (const TimeUnit& aOther) const {
+  bool operator<(const TimeUnit& aOther) const { return !(*this >= aOther); }
+  TimeUnit operator+(const TimeUnit& aOther) const
+  {
     if (IsInfinite() || aOther.IsInfinite()) {
       return FromInfinity();
     }
     return TimeUnit(mValue + aOther.mValue);
   }
-  TimeUnit operator - (const TimeUnit& aOther) const {
+  TimeUnit operator-(const TimeUnit& aOther) const
+  {
     if (IsInfinite() && !aOther.IsInfinite()) {
       return FromInfinity();
     }
     MOZ_ASSERT(!IsInfinite() && !aOther.IsInfinite());
     return TimeUnit(mValue - aOther.mValue);
   }
-  TimeUnit& operator += (const TimeUnit& aOther) {
+  TimeUnit& operator+=(const TimeUnit& aOther)
+  {
     *this = *this + aOther;
     return *this;
   }
-  TimeUnit& operator -= (const TimeUnit& aOther) {
+  TimeUnit& operator-=(const TimeUnit& aOther)
+  {
     *this = *this - aOther;
     return *this;
   }
 
-  template <typename T>
-  TimeUnit operator*(T aVal) const {
+  template<typename T>
+  TimeUnit operator*(T aVal) const
+  {
     // See bug 853398 for the reason to block double multiplier.
     // If required, use MultDouble below and with caution.
     static_assert(mozilla::IsIntegral<T>::value, "Must be an integral type");
     return TimeUnit(mValue * aVal);
   }
-  TimeUnit MultDouble(double aVal) const {
+  TimeUnit MultDouble(double aVal) const
+  {
     return TimeUnit::FromSeconds(ToSeconds() * aVal);
   }
-  friend TimeUnit operator/ (const TimeUnit& aUnit, int aVal) {
+  friend TimeUnit operator/(const TimeUnit& aUnit, int aVal)
+  {
     return TimeUnit(aUnit.mValue / aVal);
   }
 
-  bool IsValid() const
-  {
-    return mValue.isValid();
-  }
+  bool IsValid() const { return mValue.isValid(); }
 
   constexpr TimeUnit()
     : mValue(CheckedInt64(0))
-  {}
+  {
+  }
 
   TimeUnit(const TimeUnit&) = default;
 
-  TimeUnit& operator = (const TimeUnit&) = default;
+  TimeUnit& operator=(const TimeUnit&) = default;
 
 private:
   explicit constexpr TimeUnit(CheckedInt64 aMicroseconds)
     : mValue(aMicroseconds)
-  {}
+  {
+  }
 
   // Our internal representation is in microseconds.
   CheckedInt64 mValue;
 };
 
 typedef Maybe<TimeUnit> NullableTimeUnit;
 
 typedef Interval<TimeUnit> TimeInterval;
@@ -212,36 +212,40 @@ public:
   // constructors found in IntervalSet base class.
   // all this could be later replaced with:
   // using IntervalSet<TimeUnit>::IntervalSet;
 
   // MOZ_IMPLICIT as we want to enable initialization in the form:
   // TimeIntervals i = ... like we would do with IntervalSet<T> i = ...
   MOZ_IMPLICIT TimeIntervals(const BaseType& aOther)
     : BaseType(aOther)
-  {}
+  {
+  }
   MOZ_IMPLICIT TimeIntervals(BaseType&& aOther)
     : BaseType(Move(aOther))
-  {}
+  {
+  }
   explicit TimeIntervals(const BaseType::ElemType& aOther)
     : BaseType(aOther)
-  {}
+  {
+  }
   explicit TimeIntervals(BaseType::ElemType&& aOther)
     : BaseType(Move(aOther))
-  {}
+  {
+  }
 
   static TimeIntervals Invalid()
   {
     return TimeIntervals(TimeInterval(TimeUnit::FromMicroseconds(INT64_MIN),
                                       TimeUnit::FromMicroseconds(INT64_MIN)));
   }
   bool IsInvalid() const
   {
     return Length() == 1 && Start(0).ToMicroseconds() == INT64_MIN &&
-      End(0).ToMicroseconds() == INT64_MIN;
+           End(0).ToMicroseconds() == INT64_MIN;
   }
 
   TimeIntervals() = default;
 };
 
 } // namespace media
 } // namespace mozilla