From 955086981a337f93e2e207f390248da5d346480f Mon Sep 17 00:00:00 2001 From: David Zbarsky Date: Fri, 13 Jul 2012 11:49:31 -0700 Subject: [PATCH] [Bug 773500] nsStyleAnimation checks for common units of nsCSSValuePair/Triplet are screwy r=dbaron --- layout/style/nsStyleAnimation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/style/nsStyleAnimation.cpp b/layout/style/nsStyleAnimation.cpp index 9f66b9f65fddd..17ab29a2feee8 100644 --- a/layout/style/nsStyleAnimation.cpp +++ b/layout/style/nsStyleAnimation.cpp @@ -409,7 +409,7 @@ nsStyleAnimation::ComputeDistance(nsCSSProperty aProperty, unit[2] = GetCommonUnit(aProperty, triplet1->mZValue.GetUnit(), triplet2->mZValue.GetUnit()); if (unit[0] == eCSSUnit_Null || unit[1] == eCSSUnit_Null || - unit[0] == eCSSUnit_URL) { + unit[2] == eCSSUnit_Null) { return false; } @@ -1758,7 +1758,7 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty, unit[2] = GetCommonUnit(aProperty, triplet1.mZValue.GetUnit(), triplet2.mZValue.GetUnit()); if (unit[0] == eCSSUnit_Null || unit[1] == eCSSUnit_Null || - unit[0] == eCSSUnit_Null || unit[0] == eCSSUnit_URL) { + unit[2] == eCSSUnit_Null) { return false; }