mozilla-inbound: changeset 299090:4c23a043fc70f179c0aae0077820f369f475d980

author	Chris Peterson <cpeterson@mozilla.com>
	Sun, 22 May 2016 21:02:12 -0700
changeset 299090	4c23a043fc70f179c0aae0077820f369f475d980
parent 299089	5f821afd7299cea7f16730153a1d1b798d8d5165
child 299091	e9de9eee6be361530f7d5b1d1e2bc0be1d608cfe
push id	77427
push user	cpeterson@mozilla.com
push date	Thu, 26 May 2016 04:00:17 +0000
treeherder	mozilla-inbound@4c23a043fc70 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	daisuke
bugs	1275475
milestone	49.0a1
first release with	nightly linux32 4d63dde701b4 / 49.0a1 / 20160527030220 / files nightly linux64 4d63dde701b4 / 49.0a1 / 20160527030220 / files nightly mac 4d63dde701b4 / 49.0a1 / 20160527030220 / files nightly win32 4d63dde701b4 / 49.0a1 / 20160527030220 / files nightly win64 4d63dde701b4 / 49.0a1 / 20160527030220 / files
last release without	nightly linux32 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly linux64 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly mac 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly win32 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly win64 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files

--- a/dom/animation/ComputedTimingFunction.cpp
+++ b/dom/animation/ComputedTimingFunction.cpp
@@ -25,18 +25,18 @@ ComputedTimingFunction::Init(const nsTim
 
 static inline double
 StepTiming(uint32_t aSteps,
            double aPortion,
            ComputedTimingFunction::BeforeFlag aBeforeFlag,
            nsTimingFunction::Type aType)
 {
   MOZ_ASSERT(0.0 <= aPortion && aPortion <= 1.0, "out of range");
-  MOZ_ASSERT(aType != nsTimingFunction::Type::StepStart ||
-             aType != nsTimingFunction::Type::StepEnd, "invalid type");
+  MOZ_ASSERT(aType == nsTimingFunction::Type::StepStart ||
+             aType == nsTimingFunction::Type::StepEnd, "invalid type");
 
   if (aPortion == 1.0) {
     return 1.0;
   }
 
   // Calculate current step using step-end behavior
   uint32_t step = uint32_t(aPortion * aSteps); // floor