| 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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #ifndef CompositorAnimationsImpl_h | 31 #ifndef CompositorAnimationsImpl_h |
| 32 #define CompositorAnimationsImpl_h | 32 #define CompositorAnimationsImpl_h |
| 33 | 33 |
| 34 #include "core/CoreExport.h" | 34 #include "core/CoreExport.h" |
| 35 #include "core/animation/EffectModel.h" | 35 #include "core/animation/EffectModel.h" |
| 36 #include "core/animation/KeyframeEffectModel.h" | 36 #include "core/animation/KeyframeEffectModel.h" |
| 37 #include "core/animation/Timing.h" | 37 #include "core/animation/Timing.h" |
| 38 #include "platform/animation/TimingFunction.h" | 38 #include "platform/animation/TimingFunction.h" |
| 39 #include "public/platform/WebCompositorAnimation.h" | 39 #include "public/platform/WebCompositorAnimation.h" |
| 40 #include "wtf/Allocator.h" |
| 40 | 41 |
| 41 namespace blink { | 42 namespace blink { |
| 42 | 43 |
| 43 class WebCompositorAnimationCurve; | 44 class WebCompositorAnimationCurve; |
| 44 | 45 |
| 45 class CORE_EXPORT CompositorAnimationsImpl { | 46 class CORE_EXPORT CompositorAnimationsImpl { |
| 47 STATIC_ONLY(CompositorAnimationsImpl); |
| 46 private: | 48 private: |
| 47 struct CompositorTiming { | 49 struct CompositorTiming { |
| 50 DISALLOW_ALLOCATION(); |
| 48 void assertValid() const | 51 void assertValid() const |
| 49 { | 52 { |
| 50 ASSERT(scaledDuration > 0); | 53 ASSERT(scaledDuration > 0); |
| 51 ASSERT(std::isfinite(scaledTimeOffset)); | 54 ASSERT(std::isfinite(scaledTimeOffset)); |
| 52 ASSERT(adjustedIterationCount > 0 || adjustedIterationCount == -1); | 55 ASSERT(adjustedIterationCount > 0 || adjustedIterationCount == -1); |
| 53 ASSERT(std::isfinite(playbackRate) && playbackRate); | 56 ASSERT(std::isfinite(playbackRate) && playbackRate); |
| 54 ASSERT(iterationStart >= 0); | 57 ASSERT(iterationStart >= 0); |
| 55 } | 58 } |
| 56 | 59 |
| 57 Timing::PlaybackDirection direction; | 60 Timing::PlaybackDirection direction; |
| (...skipping 11 matching lines...) Expand all Loading... |
| 69 | 72 |
| 70 static void addKeyframesToCurve(WebCompositorAnimationCurve&, const Animatab
leValuePropertySpecificKeyframeVector&, const Timing&); | 73 static void addKeyframesToCurve(WebCompositorAnimationCurve&, const Animatab
leValuePropertySpecificKeyframeVector&, const Timing&); |
| 71 | 74 |
| 72 friend class CompositorAnimations; | 75 friend class CompositorAnimations; |
| 73 friend class AnimationCompositorAnimationsTest; | 76 friend class AnimationCompositorAnimationsTest; |
| 74 }; | 77 }; |
| 75 | 78 |
| 76 } // namespace blink | 79 } // namespace blink |
| 77 | 80 |
| 78 #endif | 81 #endif |
| OLD | NEW |