| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2013 Google Inc. All rights reserved. | 2  * Copyright (C) 2013 Google Inc. All rights reserved. | 
| 3  * | 3  * | 
| 4  * Redistribution and use in source and binary forms, with or without | 4  * Redistribution and use in source and binary forms, with or without | 
| 5  * modification, are permitted provided that the following conditions are | 5  * modification, are permitted provided that the following conditions are | 
| 6  * met: | 6  * met: | 
| 7  * | 7  * | 
| 8  *     * Redistributions of source code must retain the above copyright | 8  *     * Redistributions of source code must retain the above copyright | 
| 9  * notice, this list of conditions and the following disclaimer. | 9  * notice, this list of conditions and the following disclaimer. | 
| 10  *     * Redistributions in binary form must reproduce the above | 10  *     * Redistributions in binary form must reproduce the above | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 29  */ | 29  */ | 
| 30 | 30 | 
| 31 #ifndef AnimatableLengthBoxAndBool_h | 31 #ifndef AnimatableLengthBoxAndBool_h | 
| 32 #define AnimatableLengthBoxAndBool_h | 32 #define AnimatableLengthBoxAndBool_h | 
| 33 | 33 | 
| 34 #include "core/animation/animatable/AnimatableValue.h" | 34 #include "core/animation/animatable/AnimatableValue.h" | 
| 35 | 35 | 
| 36 namespace blink { | 36 namespace blink { | 
| 37 | 37 | 
| 38 class AnimatableLengthBoxAndBool FINAL : public AnimatableValue { | 38 class AnimatableLengthBoxAndBool final : public AnimatableValue { | 
| 39 public: | 39 public: | 
| 40     virtual ~AnimatableLengthBoxAndBool() { } | 40     virtual ~AnimatableLengthBoxAndBool() { } | 
| 41     static PassRefPtrWillBeRawPtr<AnimatableLengthBoxAndBool> create(PassRefPtrW
    illBeRawPtr<AnimatableValue> box, bool flag) | 41     static PassRefPtrWillBeRawPtr<AnimatableLengthBoxAndBool> create(PassRefPtrW
    illBeRawPtr<AnimatableValue> box, bool flag) | 
| 42     { | 42     { | 
| 43         return adoptRefWillBeNoop(new AnimatableLengthBoxAndBool(box, flag)); | 43         return adoptRefWillBeNoop(new AnimatableLengthBoxAndBool(box, flag)); | 
| 44     } | 44     } | 
| 45     const AnimatableValue* box() const { return m_box.get(); } | 45     const AnimatableValue* box() const { return m_box.get(); } | 
| 46     bool flag() const { return m_flag; } | 46     bool flag() const { return m_flag; } | 
| 47 | 47 | 
| 48     virtual void trace(Visitor*) OVERRIDE; | 48     virtual void trace(Visitor*) override; | 
| 49 | 49 | 
| 50 protected: | 50 protected: | 
| 51     virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
    leValue*, double fraction) const OVERRIDE; | 51     virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
    leValue*, double fraction) const override; | 
| 52     virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER
    RIDE; | 52     virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over
    ride; | 
| 53 | 53 | 
| 54 private: | 54 private: | 
| 55     AnimatableLengthBoxAndBool(PassRefPtrWillBeRawPtr<AnimatableValue> box, bool
     flag) | 55     AnimatableLengthBoxAndBool(PassRefPtrWillBeRawPtr<AnimatableValue> box, bool
     flag) | 
| 56         : m_box(box) | 56         : m_box(box) | 
| 57         , m_flag(flag) | 57         , m_flag(flag) | 
| 58     { | 58     { | 
| 59     } | 59     } | 
| 60     virtual AnimatableType type() const OVERRIDE { return TypeLengthBoxAndBool; 
    } | 60     virtual AnimatableType type() const override { return TypeLengthBoxAndBool; 
    } | 
| 61     virtual bool equalTo(const AnimatableValue*) const OVERRIDE; | 61     virtual bool equalTo(const AnimatableValue*) const override; | 
| 62 | 62 | 
| 63     RefPtrWillBeMember<AnimatableValue> m_box; | 63     RefPtrWillBeMember<AnimatableValue> m_box; | 
| 64     bool m_flag; | 64     bool m_flag; | 
| 65 }; | 65 }; | 
| 66 | 66 | 
| 67 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthBoxAndBool, isLengthBoxAndBoo
    l()); | 67 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthBoxAndBool, isLengthBoxAndBoo
    l()); | 
| 68 | 68 | 
| 69 } // namespace blink | 69 } // namespace blink | 
| 70 | 70 | 
| 71 #endif // AnimatableLengthBoxAndBool_h | 71 #endif // AnimatableLengthBoxAndBool_h | 
| OLD | NEW | 
|---|