Fixing reflectivity of operator== for timing functions.

Source/core/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 17 matching lines @@
 #include "RuntimeEnabledFeatures.h"
 #include "platform/animation/AnimationUtilities.h" // For blend()
 #include "platform/animation/UnitBezier.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 #include <algorithm>
 
-
 namespace WebCore {
 
 class TimingFunction : public RefCounted<TimingFunction> {
 public:
 
     enum Type {
         LinearFunction, CubicBezierFunction, StepsFunction, ChainedFunction
     };
 
     virtual ~TimingFunction() { }
 
     Type type() const { return m_type; }
 
     // 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 bool operator==(const TimingFunction& other) const = 0;
+    virtual bool operator!=(const TimingFunction& other) const { return !operator==(other); }
 
 protected:
     TimingFunction(Type type)
         : m_type(type)
     {
     }
 
 private:
     Type m_type;
 };
@@ skipping 80 matching lines @@
     {
         ASSERT(RuntimeEnabledFeatures::webAnimationsEnabled() || (fraction >= 0 && fraction <= 1));
         RELEASE_ASSERT_WITH_MESSAGE(!RuntimeEnabledFeatures::webAnimationsEnabled() || (fraction >= 0 && fraction <= 1), "Web Animations not yet implemented: Timing function behavior outside the range [0, 1] is not yet specified");
         if (!m_bezier)
             m_bezier = adoptPtr(new UnitBezier(m_x1, m_y1, m_x2, m_y2));
         return m_bezier->solve(fraction, accuracy);
     }
 
     virtual bool operator==(const TimingFunction& other) const
     {
-        if (other.type() == CubicBezierFunction) {
-            const CubicBezierTimingFunction* ctf = static_cast<const CubicBezierTimingFunction*>(&other);
-            if (m_subType != Custom)
-                return m_subType == ctf->m_subType;
+        if (other.type() != CubicBezierFunction)
+            return false;
 
+        const CubicBezierTimingFunction* ctf = static_cast<const CubicBezierTimingFunction*>(&other);
+        if (m_subType == Custom && ctf->m_subType == Custom)
             return m_x1 == ctf->m_x1 && m_y1 == ctf->m_y1 && m_x2 == ctf->m_x2 && m_y2 == ctf->m_y2;
-        }
-        return false;
+
+        return m_subType == ctf->m_subType;
     }
 
     double x1() const { return m_x1; }
     double y1() const { return m_y1; }
     double x2() const { return m_x2; }
     double y2() const { return m_y2; }
 
     SubType subType() const { return m_subType; }
 
 private:
@@ skipping 52 matching lines @@
 
     virtual double evaluate(double fraction, double) const
     {
         ASSERT(RuntimeEnabledFeatures::webAnimationsEnabled() || (fraction >= 0 && fraction <= 1));
         RELEASE_ASSERT_WITH_MESSAGE(!RuntimeEnabledFeatures::webAnimationsEnabled() || (fraction >= 0 && fraction <= 1), "Web Animations not yet implemented: Timing function behavior outside the range [0, 1] is not yet specified");
         return std::min(1.0, (floor(m_steps * fraction) + m_stepAtStart) / m_steps);
     }
 
     virtual bool operator==(const TimingFunction& other) const
     {
-        if (other.type() == StepsFunction) {
-            const StepsTimingFunction* stf = static_cast<const StepsTimingFunction*>(&other);
-            if (m_subType != Custom)
-                return m_subType == stf->m_subType;
+        if (other.type() != StepsFunction)
+            return false;
+
+        const StepsTimingFunction* stf = static_cast<const StepsTimingFunction*>(&other);
+        if (m_subType == Custom && stf->m_subType == Custom)
             return m_steps == stf->m_steps && m_stepAtStart == stf->m_stepAtStart;
-        }
-        return false;
+
+        return m_subType == stf->m_subType;
     }
 
     int numberOfSteps() const { return m_steps; }
     bool stepAtStart() const { return m_stepAtStart; }
 
     SubType subType() const { return m_subType; }
 
 private:
     StepsTimingFunction(SubType subType, int steps, bool stepAtStart)
         : TimingFunction(StepsFunction)
@@ skipping 14 matching lines @@
     {
         return adoptRef(new ChainedTimingFunction);
     }
 
     void appendSegment(double upperBound, TimingFunction* timingFunction)
     {
         double max = m_segments.isEmpty() ? 0 : m_segments.last().max();
         ASSERT(upperBound > max);
         m_segments.append(Segment(max, upperBound, timingFunction));
     }
+
     virtual double evaluate(double fraction, double accuracy) const
     {
         RELEASE_ASSERT_WITH_MESSAGE(fraction >= 0 && fraction <= 1, "Web Animations not yet implemented: Timing function behavior outside the range [0, 1] is not yet specified");
         ASSERT(!m_segments.isEmpty());
         ASSERT(m_segments.last().max() == 1);
         size_t i = 0;
         const Segment* segment = &m_segments[i++];
         while (fraction >= segment->max() && i < m_segments.size()) {
             segment = &m_segments[i++];
         }
@@ skipping 44 matching lines @@
     Vector<Segment> m_segments;
 
     // Allow printing of our segments. Can be removed once
     // ChainedTimingFunction has a public API for segments.
     friend class ChainedTimingFunctionPrintTo;
 };
 
 } // namespace WebCore
 
 #endif // TimingFunction_h