Clean up KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues()

Source/core/animation/KeyframeEffectModel.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 75 matching lines @@
 
 void KeyframeEffectModelBase::updateNeutralKeyframeAnimatableValues(CSSPropertyID property, PassRefPtrWillBeRawPtr<AnimatableValue> value)
 {
     ASSERT(CompositorAnimations::isCompositableProperty(property));
 
     if (!value)
         return;
 
     ensureKeyframeGroups();
     auto& keyframes = m_keyframeGroups->get(property)->m_keyframes;
+    ASSERT(keyframes.size() >= 2);
 
-    ASSERT(keyframes.size() >= 2);
-    ASSERT(!toStringPropertySpecificKeyframe(*keyframes[0]).value() || !toStringPropertySpecificKeyframe(*keyframes[keyframes.size() - 1]).value());
+    auto& first = toStringPropertySpecificKeyframe(*keyframes.first());
+    auto& last = toStringPropertySpecificKeyframe(*keyframes.last());
+    ASSERT(!first.value() || !last.value());
 
-    if (!toStringPropertySpecificKeyframe(*keyframes.first()).value())
-        toStringPropertySpecificKeyframe(*keyframes.first()).setAnimatableValue(value);
-    if (!toStringPropertySpecificKeyframe(*keyframes.last()).value())
-        toStringPropertySpecificKeyframe(*keyframes.last()).setAnimatableValue(value);
-
-    // FIXME: Handle neutral keyframes that are not at 0% or 100%.
+    if (!first.value())
+        first.setAnimatableValue(value);
+    if (!last.value())
+        last.setAnimatableValue(value);
 }
 
 KeyframeEffectModelBase::KeyframeVector KeyframeEffectModelBase::normalizedKeyframes(const KeyframeVector& keyframes)
 {
     double lastOffset = 0;
     KeyframeVector result;
     result.reserveCapacity(keyframes.size());
 
     for (const auto& keyframe : keyframes) {
         double offset = keyframe->offset();
@@ skipping 153 matching lines @@
 }
 
 DEFINE_TRACE(KeyframeEffectModelBase::PropertySpecificKeyframeGroup)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_keyframes);
 #endif
 }
 
 } // namespace