Ensure baseComputedStyle optimisation is cleared during registered custom property animations

third_party/WebKit/Source/core/animation/ElementAnimation.h

 /*
  * 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 48 matching lines @@
     EffectModel* effect = EffectInput::convert(
         &element, effectInput, scriptState->getExecutionContext(),
         exceptionState);
     if (exceptionState.hadException())
       return nullptr;
 
     Timing timing;
     if (!TimingInput::convert(duration, timing, exceptionState))
       return nullptr;
 
-    return animateInternal(element, effect, timing);
+    return animate(element, effect, timing);
   }
 
   static Animation* animate(ScriptState* scriptState,
                             Element& element,
                             const DictionarySequenceOrDictionary& effectInput,
                             const KeyframeEffectOptions& options,
                             ExceptionState& exceptionState) {
     EffectModel* effect = EffectInput::convert(
         &element, effectInput, scriptState->getExecutionContext(),
         exceptionState);
     if (exceptionState.hadException())
       return nullptr;
 
     Timing timing;
     if (!TimingInput::convert(options, timing, &element.document(),
                               exceptionState))
       return nullptr;
 
-    Animation* animation = animateInternal(element, effect, timing);
+    Animation* animation = animate(element, effect, timing);
     animation->setId(options.id());
     return animation;
   }
 
   static Animation* animate(ScriptState* scriptState,
                             Element& element,
                             const DictionarySequenceOrDictionary& effectInput,
                             ExceptionState& exceptionState) {
     EffectModel* effect = EffectInput::convert(
         &element, effectInput, scriptState->getExecutionContext(),
         exceptionState);
     if (exceptionState.hadException())
       return nullptr;
-    return animateInternal(element, effect, Timing());
+    return animate(element, effect, Timing());
+  }
+
+  static Animation* animate(Element& element,
+                            EffectModel* effect,
+                            const Timing& timing) {
+    KeyframeEffect* keyframeEffect =
+        KeyframeEffect::create(&element, effect, timing);
+    return element.document().timeline().play(keyframeEffect);
   }
 
   static HeapVector<Member<Animation>> getAnimations(Element& element) {
     HeapVector<Member<Animation>> animations;
 
     if (!element.hasAnimations())
       return animations;
 
     for (const auto& animation :
          element.document().timeline().getAnimations()) {
       DCHECK(animation->effect());
       if (toKeyframeEffectReadOnly(animation->effect())->target() == element &&
           (animation->effect()->isCurrent() ||
            animation->effect()->isInEffect()))
         animations.push_back(animation);
     }
     return animations;
   }
-
- private:
-  static Animation* animateInternal(Element& element,
-                                    EffectModel* effect,
-                                    const Timing& timing) {
-    KeyframeEffect* keyframeEffect =
-        KeyframeEffect::create(&element, effect, timing);
-    return element.document().timeline().play(keyframeEffect);
-  }
 };
 
 }  // namespace blink
 
 #endif  // ElementAnimation_h