Don't transition a property that is currentColor when color changes

Source/core/animation/css/CSSPropertyEquality.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/animation/css/CSSPropertyEquality.h"
 
 #include "core/animation/css/CSSAnimations.h"
 #include "core/rendering/style/DataEquivalency.h"
 #include "core/rendering/style/RenderStyle.h"
@@ skipping 42 matching lines @@
     // FIXME: Shouldn't this be return !aLayer && !bLayer; ?
     return true;
 }
 
 }
 
 bool CSSPropertyEquality::propertiesEqual(CSSPropertyID prop, const RenderStyle& a, const RenderStyle& b)
 {
     switch (prop) {
     case CSSPropertyBackgroundColor:
-        return a.backgroundColor().resolve(a.color()) == b.backgroundColor().resolve(b.color())
-            && a.visitedLinkBackgroundColor().resolve(a.color()) == b.visitedLinkBackgroundColor().resolve(b.color());
+        return a.backgroundColor() == b.backgroundColor()
+            && a.visitedLinkBackgroundColor() == b.visitedLinkBackgroundColor();
     case CSSPropertyBackgroundImage:
         return fillLayersEqual<CSSPropertyBackgroundImage>(a.backgroundLayers(), b.backgroundLayers());
     case CSSPropertyBackgroundPositionX:
         return fillLayersEqual<CSSPropertyBackgroundPositionX>(a.backgroundLayers(), b.backgroundLayers());
     case CSSPropertyBackgroundPositionY:
         return fillLayersEqual<CSSPropertyBackgroundPositionY>(a.backgroundLayers(), b.backgroundLayers());
     case CSSPropertyBackgroundSize:
         return fillLayersEqual<CSSPropertyBackgroundSize>(a.backgroundLayers(), b.backgroundLayers());
     case CSSPropertyBaselineShift:
         return dataEquivalent(a.baselineShiftValue(), b.baselineShiftValue());
     case CSSPropertyBorderBottomColor:
-        return a.borderBottomColor().resolve(a.color()) == b.borderBottomColor().resolve(b.color())
-            && a.visitedLinkBorderBottomColor().resolve(a.color()) == b.visitedLinkBorderBottomColor().resolve(b.color());
+        return a.borderBottomColor() == b.borderBottomColor()
+            && a.visitedLinkBorderBottomColor() == b.visitedLinkBorderBottomColor();
     case CSSPropertyBorderBottomLeftRadius:
         return a.borderBottomLeftRadius() == b.borderBottomLeftRadius();
     case CSSPropertyBorderBottomRightRadius:
         return a.borderBottomRightRadius() == b.borderBottomRightRadius();
     case CSSPropertyBorderBottomWidth:
         return a.borderBottomWidth() == b.borderBottomWidth();
     case CSSPropertyBorderImageOutset:
         return a.borderImageOutset() == b.borderImageOutset();
     case CSSPropertyBorderImageSlice:
         return a.borderImageSlices() == b.borderImageSlices();
     case CSSPropertyBorderImageSource:
         return dataEquivalent(a.borderImageSource(), b.borderImageSource());
     case CSSPropertyBorderImageWidth:
         return a.borderImageWidth() == b.borderImageWidth();
     case CSSPropertyBorderLeftColor:
-        return a.borderLeftColor().resolve(a.color()) == b.borderLeftColor().resolve(b.color())
-            && a.visitedLinkBorderLeftColor().resolve(a.color()) == b.visitedLinkBorderLeftColor().resolve(b.color());
+        return a.borderLeftColor() == b.borderLeftColor()
+            && a.visitedLinkBorderLeftColor() == b.visitedLinkBorderLeftColor();
     case CSSPropertyBorderLeftWidth:
         return a.borderLeftWidth() == b.borderLeftWidth();
     case CSSPropertyBorderRightColor:
-        return a.borderRightColor().resolve(a.color()) == b.borderRightColor().resolve(b.color())
-            && a.visitedLinkBorderRightColor().resolve(a.color()) == b.visitedLinkBorderRightColor().resolve(b.color());
+        return a.borderRightColor() == b.borderRightColor()
+            && a.visitedLinkBorderRightColor() == b.visitedLinkBorderRightColor();
     case CSSPropertyBorderRightWidth:
         return a.borderRightWidth() == b.borderRightWidth();
     case CSSPropertyBorderTopColor:
-        return a.borderTopColor().resolve(a.color()) == b.borderTopColor().resolve(b.color())
-            && a.visitedLinkBorderTopColor().resolve(a.color()) == b.visitedLinkBorderTopColor().resolve(b.color());
+        return a.borderTopColor() == b.borderTopColor()
+            && a.visitedLinkBorderTopColor() == b.visitedLinkBorderTopColor();
     case CSSPropertyBorderTopLeftRadius:
         return a.borderTopLeftRadius() == b.borderTopLeftRadius();
     case CSSPropertyBorderTopRightRadius:
         return a.borderTopRightRadius() == b.borderTopRightRadius();
     case CSSPropertyBorderTopWidth:
         return a.borderTopWidth() == b.borderTopWidth();
     case CSSPropertyBottom:
         return a.bottom() == b.bottom();
     case CSSPropertyBoxShadow:
         return dataEquivalent(a.boxShadow(), b.boxShadow());
@@ skipping 59 matching lines @@
         return a.minHeight() == b.minHeight();
     case CSSPropertyMinWidth:
         return a.minWidth() == b.minWidth();
     case CSSPropertyObjectPosition:
         return a.objectPosition() == b.objectPosition();
     case CSSPropertyOpacity:
         return a.opacity() == b.opacity();
     case CSSPropertyOrphans:
         return a.orphans() == b.orphans();
     case CSSPropertyOutlineColor:
-        return a.outlineColor().resolve(a.color()) == b.outlineColor().resolve(b.color())
-            && a.visitedLinkOutlineColor().resolve(a.color()) == b.visitedLinkOutlineColor().resolve(b.color());
+        return a.outlineColor() == b.outlineColor()
+            && a.visitedLinkOutlineColor() == b.visitedLinkOutlineColor();
     case CSSPropertyOutlineOffset:
         return a.outlineOffset() == b.outlineOffset();
     case CSSPropertyOutlineWidth:
         return a.outlineWidth() == b.outlineWidth();
     case CSSPropertyPaddingBottom:
         return a.paddingBottom() == b.paddingBottom();
     case CSSPropertyPaddingLeft:
         return a.paddingLeft() == b.paddingLeft();
     case CSSPropertyPaddingRight:
         return a.paddingRight() == b.paddingRight();
@@ skipping 23 matching lines @@
         return dataEquivalent(a.strokeDashArray(), b.strokeDashArray());
     case CSSPropertyStrokeDashoffset:
         return dataEquivalent(a.strokeDashOffset(), b.strokeDashOffset());
     case CSSPropertyStrokeMiterlimit:
         return a.strokeMiterLimit() == b.strokeMiterLimit();
     case CSSPropertyStrokeOpacity:
         return a.strokeOpacity() == b.strokeOpacity();
     case CSSPropertyStrokeWidth:
         return dataEquivalent(a.strokeWidth(), b.strokeWidth());
     case CSSPropertyTextDecorationColor:
-        return a.textDecorationColor().resolve(a.color()) == b.textDecorationColor().resolve(b.color())
-            && a.visitedLinkTextDecorationColor().resolve(a.color()) == b.visitedLinkTextDecorationColor().resolve(b.color());
+        return a.textDecorationColor() == b.textDecorationColor()
+            && a.visitedLinkTextDecorationColor() == b.visitedLinkTextDecorationColor();
     case CSSPropertyTextIndent:
         return a.textIndent() == b.textIndent();
     case CSSPropertyTextShadow:
         return dataEquivalent(a.textShadow(), b.textShadow());
     case CSSPropertyTop:
         return a.top() == b.top();
     case CSSPropertyVerticalAlign:
         return a.verticalAlign() == b.verticalAlign()
             && (a.verticalAlign() != LENGTH || a.verticalAlignLength() == b.verticalAlignLength());
     case CSSPropertyVisibility:
         return a.visibility() == b.visibility();
     case CSSPropertyWebkitBackgroundSize:
         return fillLayersEqual<CSSPropertyWebkitBackgroundSize>(a.backgroundLayers(), b.backgroundLayers());
     case CSSPropertyWebkitBorderHorizontalSpacing:
         return a.horizontalBorderSpacing() == b.horizontalBorderSpacing();
     case CSSPropertyWebkitBorderVerticalSpacing:
         return a.verticalBorderSpacing() == b.verticalBorderSpacing();
     case CSSPropertyWebkitBoxShadow:
         return dataEquivalent(a.boxShadow(), b.boxShadow());
     case CSSPropertyWebkitClipPath:
         return dataEquivalent(a.clipPath(), b.clipPath());
     case CSSPropertyWebkitColumnCount:
         return a.columnCount() == b.columnCount();
     case CSSPropertyWebkitColumnGap:
         return a.columnGap() == b.columnGap();
     case CSSPropertyWebkitColumnRuleColor:
-        return a.columnRuleColor().resolve(a.color()) == b.columnRuleColor().resolve(b.color())
-            && a.visitedLinkColumnRuleColor().resolve(a.color()) == b.visitedLinkColumnRuleColor().resolve(b.color());
+        return a.columnRuleColor() == b.columnRuleColor()
+            && a.visitedLinkColumnRuleColor() == b.visitedLinkColumnRuleColor();
     case CSSPropertyWebkitColumnRuleWidth:
         return a.columnRuleWidth() == b.columnRuleWidth();
     case CSSPropertyWebkitColumnWidth:
         return a.columnWidth() == b.columnWidth();
     case CSSPropertyWebkitFilter:
         return a.filter() == b.filter();
     case CSSPropertyWebkitMaskBoxImageOutset:
         return a.maskBoxImageOutset() == b.maskBoxImageOutset();
     case CSSPropertyWebkitMaskBoxImageSlice:
         return a.maskBoxImageSlices() == b.maskBoxImageSlices();
     case CSSPropertyWebkitMaskBoxImageSource:
         return dataEquivalent(a.maskBoxImageSource(), b.maskBoxImageSource());
     case CSSPropertyWebkitMaskBoxImageWidth:
         return a.maskBoxImageWidth() == b.maskBoxImageWidth();
     case CSSPropertyWebkitMaskImage:
         return dataEquivalent(a.maskImage(), b.maskImage());
     case CSSPropertyWebkitMaskPositionX:
         return fillLayersEqual<CSSPropertyWebkitMaskPositionX>(a.maskLayers(), b.maskLayers());
     case CSSPropertyWebkitMaskPositionY:
         return fillLayersEqual<CSSPropertyWebkitMaskPositionY>(a.maskLayers(), b.maskLayers());
     case CSSPropertyWebkitMaskSize:
         return fillLayersEqual<CSSPropertyWebkitMaskSize>(a.maskLayers(), b.maskLayers());
     case CSSPropertyPerspective:
         return a.perspective() == b.perspective();
     case CSSPropertyPerspectiveOrigin:
         return a.perspectiveOriginX() == b.perspectiveOriginX() && a.perspectiveOriginY() == b.perspectiveOriginY();
     case CSSPropertyWebkitTextStrokeColor:
-        return a.textStrokeColor().resolve(a.color()) == b.textStrokeColor().resolve(b.color())
-            && a.visitedLinkTextStrokeColor().resolve(a.color()) == b.visitedLinkTextStrokeColor().resolve(b.color());
+        return a.textStrokeColor() == b.textStrokeColor()
+            && a.visitedLinkTextStrokeColor() == b.visitedLinkTextStrokeColor();
     case CSSPropertyTransform:
         return a.transform() == b.transform();
     case CSSPropertyTransformOrigin:
         return a.transformOriginX() == b.transformOriginX() && a.transformOriginY() == b.transformOriginY() && a.transformOriginZ() == b.transformOriginZ();
     case CSSPropertyWidows:
         return a.widows() == b.widows();
     case CSSPropertyWidth:
         return a.width() == b.width();
     case CSSPropertyWordSpacing:
         return a.wordSpacing() == b.wordSpacing();
     case CSSPropertyZIndex:
         return a.zIndex() == b.zIndex();
     case CSSPropertyZoom:
         return a.zoom() == b.zoom();
     default:
         ASSERT_NOT_REACHED();
         return true;
     }
 }
 
 }