Web Animations API: Implement step-middle and steps(x, middle) timing functions.

Source/platform/animation/TimingFunction.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 20 matching lines @@
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 #include <algorithm>
 
-
 namespace WebCore {
 
 class PLATFORM_EXPORT TimingFunction : public RefCounted<TimingFunction> {
 public:
 
     enum Type {
         LinearFunction, CubicBezierFunction, StepsFunction, ChainedFunction
     };
 
     virtual ~TimingFunction() { }
 
     Type type() const { return m_type; }
 
     virtual String toString() const = 0;
 
     // Evaluates the timing function at the given fraction. The accuracy parameter provides a hint as to the required
     // accuracy and is not guaranteed.
-    virtual double evaluate(double fraction, double accuracy) const =0;
+    virtual double evaluate(double fraction, double accuracy) const = 0;
 
 protected:
     TimingFunction(Type type)
         : m_type(type)
     {
     }
 
 private:
     Type m_type;
 };
@@ skipping 11 matching lines @@
 
     virtual double evaluate(double fraction, double) const OVERRIDE;
 
 private:
     LinearTimingFunction()
         : TimingFunction(LinearFunction)
     {
     }
 };
 
-// Forward declare so we can friend it below. Don't use in production code!
-class ChainedTimingFunctionTestHelper;
-
 class PLATFORM_EXPORT CubicBezierTimingFunction FINAL : public TimingFunction {
 public:
     enum SubType {
         Ease,
         EaseIn,
         EaseOut,
         EaseInOut,
         Custom
     };
 
@@ skipping 61 matching lines @@
     double m_y2;
     SubType m_subType;
     mutable OwnPtr<UnitBezier> m_bezier;
 };
 
 class PLATFORM_EXPORT StepsTimingFunction FINAL : public TimingFunction {
 public:
     enum SubType {
         Start,
         End,
+        Middle,
         Custom
     };
 
-    static PassRefPtr<StepsTimingFunction> create(int steps, bool stepAtStart)
+    enum StepAtPosition {
+        StepAtStart,
+        StepAtMiddle,
+        StepAtEnd
+    };
+
+    static PassRefPtr<StepsTimingFunction> create(int steps, StepAtPosition stepAtPosition)
     {
-        return adoptRef(new StepsTimingFunction(Custom, steps, stepAtStart));
+        return adoptRef(new StepsTimingFunction(Custom, steps, stepAtPosition));
     }
 
     static StepsTimingFunction* preset(SubType subType)
     {
         switch (subType) {
         case Start:
             {
-                DEFINE_STATIC_REF(StepsTimingFunction, start, (adoptRef(new StepsTimingFunction(Start, 1, true))));
+                DEFINE_STATIC_REF(StepsTimingFunction, start, (adoptRef(new StepsTimingFunction(Start, 1, StepAtStart))));
                 return start;
             }
+        case Middle:
+            {
+                DEFINE_STATIC_REF(StepsTimingFunction, middle, (adoptRef(new StepsTimingFunction(Middle, 1, StepAtMiddle))));
+                return middle;
+            }
         case End:
             {
-                DEFINE_STATIC_REF(StepsTimingFunction, end, (adoptRef(new StepsTimingFunction(End, 1, false))));
+                DEFINE_STATIC_REF(StepsTimingFunction, end, (adoptRef(new StepsTimingFunction(End, 1, StepAtEnd))));
                 return end;
             }
         default:
             ASSERT_NOT_REACHED();
             return 0;
         }
     }
 
 
     virtual ~StepsTimingFunction() { }
 
     virtual String toString() const OVERRIDE;
 
     virtual double evaluate(double fraction, double) const OVERRIDE;
 
     int numberOfSteps() const { return m_steps; }
-    bool stepAtStart() const { return m_stepAtStart; }
+    StepAtPosition stepAtPosition() const { return m_stepAtPosition; }
 
     SubType subType() const { return m_subType; }
 
 private:
-    StepsTimingFunction(SubType subType, int steps, bool stepAtStart)
+    StepsTimingFunction(SubType subType, int steps, StepAtPosition stepAtPosition)
         : TimingFunction(StepsFunction)
         , m_steps(steps)
-        , m_stepAtStart(stepAtStart)
+        , m_stepAtPosition(stepAtPosition)
         , m_subType(subType)
     {
     }
 
     int m_steps;
-    bool m_stepAtStart;
+    StepAtPosition m_stepAtPosition;
     SubType m_subType;
 };
 
 class PLATFORM_EXPORT ChainedTimingFunction FINAL : public TimingFunction {
 public:
     static PassRefPtr<ChainedTimingFunction> create()
     {
         return adoptRef(new ChainedTimingFunction);
     }
 
@@ skipping 33 matching lines @@
 
         // FIXME: Come up with a public API for the segments and remove this.
         friend class CompositorAnimationsImpl;
         friend class CompositorAnimations;
 
         // Allow the compositor to reverse the timing function.
         friend class CompositorAnimationsTimingFunctionReverser;
 
         // Allow PrintTo/operator== of the segments. Can be removed once
         // ChainedTimingFunction has a public API for segments.
-        friend class ChainedTimingFunctionTestHelper;
         friend class ChainedTimingFunction;
     };
 
     ChainedTimingFunction()
         : TimingFunction(ChainedFunction)
     {
     }
 
     Vector<Segment> m_segments;
 
     // FIXME: Come up with a public API for the segments and remove this.
     friend class CompositorAnimationsImpl;
     friend class CompositorAnimations;
 
     // Allow the compositor to reverse the timing function.
     friend class CompositorAnimationsTimingFunctionReverser;
 
     // Allow PrintTo/operator== of the segments. Can be removed once
     // ChainedTimingFunction has a public API for segments.
     friend class ChainedTimingFunctionTestHelper;
 };
 
+PLATFORM_EXPORT bool operator==(const LinearTimingFunction&, const TimingFunction&);
+PLATFORM_EXPORT bool operator==(const CubicBezierTimingFunction&, const TimingFunction&);
+PLATFORM_EXPORT bool operator==(const StepsTimingFunction&, const TimingFunction&);
+
+PLATFORM_EXPORT bool operator==(const TimingFunction&, const TimingFunction&);
+PLATFORM_EXPORT bool operator!=(const TimingFunction&, const TimingFunction&);
+
 #define DEFINE_TIMING_FUNCTION_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS( \
         typeName##TimingFunction, TimingFunction, value, \
         value->type() == TimingFunction::typeName##Function, \
         value.type() == TimingFunction::typeName##Function)
 
 DEFINE_TIMING_FUNCTION_TYPE_CASTS(Linear);
 DEFINE_TIMING_FUNCTION_TYPE_CASTS(CubicBezier);
 DEFINE_TIMING_FUNCTION_TYPE_CASTS(Steps);
 DEFINE_TIMING_FUNCTION_TYPE_CASTS(Chained);
 
 } // namespace WebCore
 
 #endif // TimingFunction_h