Back out 5544ddbd6581 (bug 999717) for assertions
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 22 Apr 2014 20:58:03 -0700
changeset 180090 7f1464f2298243ea91c28ebb767da1931a82e8bc
parent 180089 891de7042cd4ab8326d8d2c7bbabfad327332e36
child 180091 2cd362a43c95739111bfada87366f3550212d947
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
bugs999717
milestone31.0a1
backs out5544ddbd65815ecd27037a710869bc6027010984
Back out 5544ddbd6581 (bug 999717) for assertions CLOSED TREE
layout/style/nsStyleAnimation.cpp
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -3726,17 +3726,17 @@ nsStyleAnimation::Value::SetAndAdoptCSSR
 }
 
 void
 nsStyleAnimation::Value::SetAndAdoptCSSValueListValue(
                            nsCSSValueList *aValueList, Unit aUnit)
 {
   FreeValue();
   NS_ABORT_IF_FALSE(IsCSSValueListUnit(aUnit), "bad unit");
-  NS_ABORT_IF_FALSE((aUnit != eUnit_Dasharray && aUnit != eUnit_Filter) ||
+  NS_ABORT_IF_FALSE(aUnit != eUnit_Dasharray || aUnit != eUnit_Filter ||
                     aValueList != nullptr,
                     "dasharrays and filters may not be null");
   mUnit = aUnit;
   mValue.mCSSValueList = aValueList; // take ownership
 }
 
 void
 nsStyleAnimation::Value::SetTransformValue(nsCSSValueSharedList* aList)