| 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 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 #include "config.h" | 31 #include "sky/engine/config.h" |
| 32 #include "core/animation/AnimationStack.h" | 32 #include "sky/engine/core/animation/AnimationStack.h" |
| 33 | 33 |
| 34 #include "core/animation/CompositorAnimations.h" | |
| 35 #include "core/animation/StyleInterpolation.h" | |
| 36 #include "core/animation/css/CSSAnimations.h" | |
| 37 #include "wtf/BitArray.h" | |
| 38 #include "wtf/NonCopyingSort.h" | |
| 39 #include <algorithm> | 34 #include <algorithm> |
| 35 #include "sky/engine/core/animation/CompositorAnimations.h" |
| 36 #include "sky/engine/core/animation/StyleInterpolation.h" |
| 37 #include "sky/engine/core/animation/css/CSSAnimations.h" |
| 38 #include "sky/engine/wtf/BitArray.h" |
| 39 #include "sky/engine/wtf/NonCopyingSort.h" |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 namespace { | 43 namespace { |
| 44 | 44 |
| 45 void copyToActiveInterpolationMap(const Vector<RefPtr<blink::Interpolation> >& s
ource, HashMap<CSSPropertyID, RefPtr<blink::Interpolation> >& target) | 45 void copyToActiveInterpolationMap(const Vector<RefPtr<blink::Interpolation> >& s
ource, HashMap<CSSPropertyID, RefPtr<blink::Interpolation> >& target) |
| 46 { | 46 { |
| 47 for (size_t i = 0; i < source.size(); ++i) { | 47 for (size_t i = 0; i < source.size(); ++i) { |
| 48 Interpolation* interpolation = source[i].get(); | 48 Interpolation* interpolation = source[i].get(); |
| 49 target.set(toStyleInterpolation(interpolation)->id(), interpolation); | 49 target.set(toStyleInterpolation(interpolation)->id(), interpolation); |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 FloatBox expandingBox(originalBox); | 156 FloatBox expandingBox(originalBox); |
| 157 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand
ingBox, *anim->effect(), startRange, endRange)) | 157 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand
ingBox, *anim->effect(), startRange, endRange)) |
| 158 return false; | 158 return false; |
| 159 box.expandTo(expandingBox); | 159 box.expandTo(expandingBox); |
| 160 } | 160 } |
| 161 } | 161 } |
| 162 return true; | 162 return true; |
| 163 } | 163 } |
| 164 | 164 |
| 165 } // namespace blink | 165 } // namespace blink |
| OLD | NEW |