Unprefix the CSS 'filter' property

third_party/WebKit/Source/core/animation/CompositorAnimations.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 95 matching lines @@
     return animation->affects(targetElement, CSSPropertyTransform)
         || animation->affects(targetElement, CSSPropertyRotate)
         || animation->affects(targetElement, CSSPropertyScale)
         || animation->affects(targetElement, CSSPropertyTranslate);
 }
 
 bool hasIncompatibleAnimations(const Element& targetElement, const Animation& animationToAdd, const EffectModel& effectToAdd)
 {
     const bool affectsOpacity = effectToAdd.affects(PropertyHandle(CSSPropertyOpacity));
     const bool affectsTransform = effectToAdd.isTransformRelatedEffect();
-    const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyWebkitFilter));
+    const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyFilter));
     const bool affectsBackdropFilter = effectToAdd.affects(PropertyHandle(CSSPropertyBackdropFilter));
 
     if (!targetElement.hasAnimations())
         return false;
 
     ElementAnimations* elementAnimations = targetElement.elementAnimations();
     ASSERT(elementAnimations);
 
     for (const auto& entry : elementAnimations->animations()) {
         const Animation* attachedAnimation = entry.key;
         if (!considerAnimationAsIncompatible(*attachedAnimation, animationToAdd))
             continue;
 
         if ((affectsOpacity && attachedAnimation->affects(targetElement, CSSPropertyOpacity))
             || (affectsTransform && isTransformRelatedAnimation(targetElement, attachedAnimation))
-            || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyWebkitFilter))
+            || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyFilter))
             || (affectsBackdropFilter && attachedAnimation->affects(targetElement, CSSPropertyBackdropFilter)))
             return true;
     }
 
     return false;
 }
 
 } // namespace
 
 bool CompositorAnimations::isCompositableProperty(CSSPropertyID property)
 {
     for (CSSPropertyID id : compositableProperties) {
         if (property == id)
             return true;
     }
     return false;
 }
 
 const CSSPropertyID CompositorAnimations::compositableProperties[7] = {
     CSSPropertyOpacity,
     CSSPropertyRotate,
     CSSPropertyScale,
     CSSPropertyTransform,
     CSSPropertyTranslate,
-    CSSPropertyWebkitFilter,
+    CSSPropertyFilter,
     CSSPropertyBackdropFilter
 };
 
 bool CompositorAnimations::getAnimatedBoundingBox(FloatBox& box, const EffectModel& effect, double minValue, double maxValue)
 {
     const KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(effect);
 
     PropertyHandleSet properties = keyframeEffect.properties();
 
     if (properties.isEmpty())
@@ skipping 88 matching lines @@
             switch (property.cssProperty()) {
             case CSSPropertyOpacity:
                 break;
             case CSSPropertyRotate:
             case CSSPropertyScale:
             case CSSPropertyTranslate:
             case CSSPropertyTransform:
                 if (toAnimatableTransform(keyframe->getAnimatableValue().get())->transformOperations().dependsOnBoxSize())
                     return false;
                 break;
-            case CSSPropertyWebkitFilter:
+            case CSSPropertyFilter:
             case CSSPropertyBackdropFilter: {
                 const FilterOperations& operations = toAnimatableFilterOperations(keyframe->getAnimatableValue().get())->operations();
                 if (operations.hasFilterThatMovesPixels())
                     return false;
                 break;
             }
             default:
                 // any other types are not allowed to run on compositor.
                 return false;
             }
@@ skipping 11 matching lines @@
     if (!convertTimingForCompositor(timing, 0, out, animationPlaybackRate))
         return false;
 
     return true;
 }
 
 void CompositorAnimations::cancelIncompatibleAnimationsOnCompositor(const Element& targetElement, const Animation& animationToAdd, const EffectModel& effectToAdd)
 {
     const bool affectsOpacity = effectToAdd.affects(PropertyHandle(CSSPropertyOpacity));
     const bool affectsTransform = effectToAdd.isTransformRelatedEffect();
-    const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyWebkitFilter));
+    const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyFilter));
     const bool affectsBackdropFilter = effectToAdd.affects(PropertyHandle(CSSPropertyBackdropFilter));
 
     if (!targetElement.hasAnimations())
         return;
 
     ElementAnimations* elementAnimations = targetElement.elementAnimations();
     ASSERT(elementAnimations);
 
     for (const auto& entry : elementAnimations->animations()) {
         Animation* attachedAnimation = entry.key;
         if (!considerAnimationAsIncompatible(*attachedAnimation, animationToAdd))
             continue;
 
         if ((affectsOpacity && attachedAnimation->affects(targetElement, CSSPropertyOpacity))
             || (affectsTransform && isTransformRelatedAnimation(targetElement, attachedAnimation))
-            || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyWebkitFilter))
+            || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyFilter))
             || (affectsBackdropFilter && attachedAnimation->affects(targetElement, CSSPropertyBackdropFilter)))
             attachedAnimation->cancelAnimationOnCompositor();
     }
 }
 
 bool CompositorAnimations::canStartAnimationOnCompositor(const Element& element)
 {
     if (!Platform::current()->isThreadedAnimationEnabled())
         return false;
     return element.layoutObject() && element.layoutObject()->compositingState() == PaintsIntoOwnBacking;
@@ skipping 254 matching lines @@
         OwnPtr<CompositorAnimationCurve> curve;
         switch (property.cssProperty()) {
         case CSSPropertyOpacity: {
             targetProperty = CompositorTargetProperty::OPACITY;
             OwnPtr<CompositorFloatAnimationCurve> floatCurve = CompositorFloatAnimationCurve::create();
             addKeyframesToCurve(*floatCurve, values);
             setTimingFunctionOnCurve(*floatCurve, timing.timingFunction.get());
             curve = std::move(floatCurve);
             break;
         }
-        case CSSPropertyWebkitFilter:
+        case CSSPropertyFilter:
         case CSSPropertyBackdropFilter: {
             targetProperty = CompositorTargetProperty::FILTER;
             OwnPtr<CompositorFilterAnimationCurve> filterCurve = CompositorFilterAnimationCurve::create();
             addKeyframesToCurve(*filterCurve, values);
             setTimingFunctionOnCurve(*filterCurve, timing.timingFunction.get());
             curve = std::move(filterCurve);
             break;
         }
         case CSSPropertyRotate:
         case CSSPropertyScale:
@@ skipping 54 matching lines @@
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         animations.append(std::move(animation));
     }
     ASSERT(!animations.isEmpty());
 }
 
 } // namespace blink