Move buildFilterOperations to FilterEffectBuilder

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 23 matching lines @@
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/animation/animatable/AnimatableDouble.h"
 #include "core/animation/animatable/AnimatableFilterOperations.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/animation/animatable/AnimatableValue.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
+#include "core/paint/FilterEffectBuilder.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/animation/AnimationTranslationUtil.h"
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorAnimationPlayer.h"
 #include "platform/animation/CompositorFilterAnimationCurve.h"
 #include "platform/animation/CompositorFilterKeyframe.h"
 #include "platform/animation/CompositorFloatAnimationCurve.h"
 #include "platform/animation/CompositorFloatKeyframe.h"
 #include "platform/animation/CompositorTransformAnimationCurve.h"
 #include "platform/animation/CompositorTransformKeyframe.h"
 #include "platform/geometry/FloatBox.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCompositorSupport.h"
 #include "wtf/PtrUtil.h"
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
 namespace blink {
 
 namespace {
 
 bool considerAnimationAsIncompatible(const Animation& animation, const Animation& animationToAdd)
@@ skipping 342 matching lines @@
     DCHECK(std::isfinite(out.scaledTimeOffset));
     DCHECK(out.adjustedIterationCount > 0 || out.adjustedIterationCount == -1);
     DCHECK(std::isfinite(out.playbackRate) && out.playbackRate);
     DCHECK_GE(out.iterationStart, 0);
 
     return true;
 }
 
 namespace {
 
+CompositorFilterOperations toCompositorFilterOperations(const FilterOperations& inOperations)

[loyso (OOO), 2016/09/22 04:55:51]

There is no need to establish this function - there is just one call site in
this file.

+{
+    FilterEffectBuilder builder(nullptr, FloatRect(), 1);

[loyso (OOO), 2016/09/22 04:55:51]

Can we have a dedicated ctor with no args for this case? Now we have all those
forwarding C++11 ctors.

+    return builder.buildFilterOperations(inOperations);
+}
+
 void addKeyframeToCurve(CompositorFilterAnimationCurve& curve, Keyframe::PropertySpecificKeyframe* keyframe,
     const AnimatableValue* value, const TimingFunction& keyframeTimingFunction)
 {
     CompositorFilterKeyframe filterKeyframe(
         keyframe->offset(),
         toCompositorFilterOperations(toAnimatableFilterOperations(value)->operations()),
         keyframeTimingFunction);
     curve.addKeyframe(filterKeyframe);
 }
 
@@ skipping 107 matching lines @@
         animation->setTimeOffset(compositorTiming.scaledTimeOffset);
         animation->setDirection(compositorTiming.direction);
         animation->setPlaybackRate(compositorTiming.playbackRate);
         animation->setFillMode(compositorTiming.fillMode);
         animations.append(std::move(animation));
     }
     DCHECK(!animations.isEmpty());
 }
 
 } // namespace blink