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 24 matching lines...) Expand all Loading... | |
35 #include "core/animation/StyleInterpolation.h" | 35 #include "core/animation/StyleInterpolation.h" |
36 #include "core/animation/css/CSSAnimations.h" | 36 #include "core/animation/css/CSSAnimations.h" |
37 #include "wtf/BitArray.h" | 37 #include "wtf/BitArray.h" |
38 #include "wtf/NonCopyingSort.h" | 38 #include "wtf/NonCopyingSort.h" |
39 #include <algorithm> | 39 #include <algorithm> |
40 | 40 |
41 namespace blink { | 41 namespace blink { |
42 | 42 |
43 namespace { | 43 namespace { |
44 | 44 |
45 void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<Inte rpolation>>& source, ActiveInterpolationMap& target) | 45 void copyToActiveInterpolationMap(const HeapVector<Member<Interpolation>>& sourc e, ActiveInterpolationMap& target) |
46 { | 46 { |
47 for (const auto& interpolation : source) { | 47 for (const auto& interpolation : source) { |
48 target.set(interpolation->property(), interpolation.get()); | 48 target.set(interpolation->property(), interpolation.get()); |
49 } | 49 } |
50 } | 50 } |
51 | 51 |
52 bool compareEffects(const OwnPtrWillBeMember<SampledEffect>& effect1, const OwnP trWillBeMember<SampledEffect>& effect2) | 52 bool compareEffects(const Member<SampledEffect>& effect1, const Member<SampledEf fect>& effect2) |
53 { | 53 { |
54 ASSERT(effect1 && effect2); | 54 ASSERT(effect1 && effect2); |
55 return effect1->sequenceNumber() < effect2->sequenceNumber(); | 55 return effect1->sequenceNumber() < effect2->sequenceNumber(); |
56 } | 56 } |
57 | 57 |
58 void copyNewAnimationsToActiveInterpolationMap(const WillBeHeapVector<RawPtrWill BeMember<InertEffect>>& newAnimations, ActiveInterpolationMap& result) | 58 void copyNewAnimationsToActiveInterpolationMap(const HeapVector<Member<InertEffe ct>>& newAnimations, ActiveInterpolationMap& result) |
59 { | 59 { |
60 for (const auto& newAnimation : newAnimations) { | 60 for (const auto& newAnimation : newAnimations) { |
61 OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> sample = nullptr; | 61 HeapVector<Member<Interpolation>>* sample = nullptr; |
62 newAnimation->sample(sample); | 62 newAnimation->sample(sample); |
63 if (sample) | 63 if (sample) |
64 copyToActiveInterpolationMap(*sample, result); | 64 copyToActiveInterpolationMap(*sample, result); |
65 } | 65 } |
66 } | 66 } |
67 | 67 |
68 } // namespace | 68 } // namespace |
69 | 69 |
70 AnimationStack::AnimationStack() | 70 AnimationStack::AnimationStack() |
71 { | 71 { |
72 } | 72 } |
73 | 73 |
74 bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) con st | 74 bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) con st |
75 { | 75 { |
76 for (const auto& effect : m_effects) { | 76 for (const auto& effect : m_effects) { |
77 if (effect->effect() && effect->effect()->hasActiveAnimationsOnComposito r(property)) | 77 if (effect->effect() && effect->effect()->hasActiveAnimationsOnComposito r(property)) |
78 return true; | 78 return true; |
79 } | 79 } |
80 return false; | 80 return false; |
81 } | 81 } |
82 | 82 |
83 ActiveInterpolationMap AnimationStack::activeInterpolations(AnimationStack* anim ationStack, const WillBeHeapVector<RawPtrWillBeMember<InertEffect>>* newAnimatio ns, const WillBeHeapHashSet<RawPtrWillBeMember<const Animation>>* suppressedAnim ations, KeyframeEffect::Priority priority, double timelineCurrentTime) | 83 ActiveInterpolationMap AnimationStack::activeInterpolations(AnimationStack* anim ationStack, const HeapVector<Member<InertEffect>>* newAnimations, const HeapHash Set<Member<const Animation>>* suppressedAnimations, KeyframeEffect::Priority pri ority, double timelineCurrentTime) |
84 { | 84 { |
85 // We don't exactly know when new animations will start, but timelineCurrent Time is a good estimate. | 85 // We don't exactly know when new animations will start, but timelineCurrent Time is a good estimate. |
86 | 86 |
87 ActiveInterpolationMap result; | 87 ActiveInterpolationMap result; |
88 | 88 |
89 if (animationStack) { | 89 if (animationStack) { |
90 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>>& effects = animation Stack->m_effects; | 90 HeapVector<Member<SampledEffect>>& effects = animationStack->m_effects; |
91 // std::sort doesn't work with OwnPtrs | 91 // std::sort doesn't work with OwnPtrs |
sof
2015/05/30 11:34:04
nit: s/OwnPtr/Member/ (or remove the comment, does
peria
2015/06/01 04:43:02
Done.
| |
92 nonCopyingSort(effects.begin(), effects.end(), compareEffects); | 92 nonCopyingSort(effects.begin(), effects.end(), compareEffects); |
93 animationStack->removeClearedEffects(); | 93 animationStack->removeClearedEffects(); |
94 for (const auto& effect : effects) { | 94 for (const auto& effect : effects) { |
95 if (effect->priority() != priority || (suppressedAnimations && effec t->effect() && suppressedAnimations->contains(effect->effect()->animation()))) | 95 if (effect->priority() != priority || (suppressedAnimations && effec t->effect() && suppressedAnimations->contains(effect->effect()->animation()))) |
96 continue; | 96 continue; |
97 copyToActiveInterpolationMap(effect->interpolations(), result); | 97 copyToActiveInterpolationMap(effect->interpolations(), result); |
98 } | 98 } |
99 } | 99 } |
100 | 100 |
101 if (newAnimations) | 101 if (newAnimations) |
(...skipping 30 matching lines...) Expand all Loading... | |
132 FloatBox expandingBox(originalBox); | 132 FloatBox expandingBox(originalBox); |
133 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *effect->model(), startRange, endRange)) | 133 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *effect->model(), startRange, endRange)) |
134 return false; | 134 return false; |
135 box.expandTo(expandingBox); | 135 box.expandTo(expandingBox); |
136 } | 136 } |
137 } | 137 } |
138 return true; | 138 return true; |
139 } | 139 } |
140 | 140 |
141 } // namespace blink | 141 } // namespace blink |
OLD | NEW |