Replace AnimatableValues with ComputedStyle references for CSS Transitions

third_party/WebKit/Source/core/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 "core/css/CSSPropertyEquality.h"
 
+#include "core/animation/PropertyHandle.h"
 #include "core/css/CSSValue.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/DataEquivalency.h"
 #include "core/style/ShadowList.h"
 
 // TODO(ikilpatrick): generate this file.
 
 namespace blink {
 
 namespace {
@@ skipping 31 matching lines @@
     a_layer = a_layer->Next();
     b_layer = b_layer->Next();
   }
 
   // FIXME: Shouldn't this be return !aLayer && !bLayer; ?
   return true;
 }
 
 }  // namespace
 
-bool CSSPropertyEquality::PropertiesEqual(CSSPropertyID prop,
+bool CSSPropertyEquality::PropertiesEqual(const PropertyHandle& property,
                                           const ComputedStyle& a,
                                           const ComputedStyle& b) {
-  switch (prop) {
+  if (property.IsCSSCustomProperty()) {
+    const AtomicString& name = property.CustomPropertyName();
+    return DataEquivalent(a.GetRegisteredVariable(name),
+                          b.GetRegisteredVariable(name));
+  }
+  switch (property.CssProperty()) {
     case CSSPropertyBackgroundColor:
       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:
@@ skipping 299 matching lines @@
       return a.SvgStyle().Ry() == b.SvgStyle().Ry();
     case CSSPropertyZIndex:
       return a.HasAutoZIndex() == b.HasAutoZIndex() &&
              (a.HasAutoZIndex() || a.ZIndex() == b.ZIndex());
     default:
       NOTREACHED();
       return true;
   }
 }
 
-bool CSSPropertyEquality::RegisteredCustomPropertiesEqual(
-    const AtomicString& property_name,
-    const ComputedStyle& a,
-    const ComputedStyle& b) {
-  return DataEquivalent(a.GetRegisteredVariable(property_name),
-                        b.GetRegisteredVariable(property_name));
-}
-
 }  // namespace blink