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<blin
k::Interpolation> >& source, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember
<blink::Interpolation> >& target) | 45 void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<blin
k::Interpolation>>& source, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<
blink::Interpolation>>& target) |
46 { | 46 { |
47 for (const auto& interpolation : source) { | 47 for (const auto& interpolation : source) { |
48 target.set(toStyleInterpolation(interpolation.get())->id(), interpolatio
n.get()); | 48 target.set(toStyleInterpolation(interpolation.get())->id(), interpolatio
n.get()); |
49 } | 49 } |
50 } | 50 } |
51 | 51 |
52 bool compareEffects(const OwnPtrWillBeMember<SampledEffect>& effect1, const OwnP
trWillBeMember<SampledEffect>& effect2) | 52 bool compareEffects(const OwnPtrWillBeMember<SampledEffect>& effect1, const OwnP
trWillBeMember<SampledEffect>& 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<InertAnimation> >& newAnimations, WillBeHeapHashMap<CSSPropertyID, RefP
trWillBeMember<Interpolation> >& result) | 58 void copyNewAnimationsToActiveInterpolationMap(const WillBeHeapVector<RawPtrWill
BeMember<InertAnimation>>& newAnimations, WillBeHeapHashMap<CSSPropertyID, RefPt
rWillBeMember<Interpolation>>& result) |
59 { | 59 { |
60 for (const auto& newAnimation : newAnimations) { | 60 for (const auto& newAnimation : newAnimations) { |
61 OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>>
sample = nullptr; | 61 OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<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->animation() && effect->animation()->hasActiveAnimationsOnCom
positor(property)) | 77 if (effect->animation() && effect->animation()->hasActiveAnimationsOnCom
positor(property)) |
78 return true; | 78 return true; |
79 } | 79 } |
80 return false; | 80 return false; |
81 } | 81 } |
82 | 82 |
83 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > AnimationSt
ack::activeInterpolations(AnimationStack* animationStack, const WillBeHeapVector
<RawPtrWillBeMember<InertAnimation> >* newAnimations, const WillBeHeapHashSet<Ra
wPtrWillBeMember<const AnimationPlayer> >* suppressedAnimationPlayers, Animation
::Priority priority, double timelineCurrentTime) | 83 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> AnimationSta
ck::activeInterpolations(AnimationStack* animationStack, const WillBeHeapVector<
RawPtrWillBeMember<InertAnimation>>* newAnimations, const WillBeHeapHashSet<RawP
trWillBeMember<const AnimationPlayer>>* suppressedAnimationPlayers, Animation::P
riority priority, 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 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result; | 87 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> result; |
88 | 88 |
89 if (animationStack) { | 89 if (animationStack) { |
90 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> >& effects = animatio
nStack->m_effects; | 90 WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>>& effects = animation
Stack->m_effects; |
91 // std::sort doesn't work with OwnPtrs | 91 // std::sort doesn't work with OwnPtrs |
92 nonCopyingSort(effects.begin(), effects.end(), compareEffects); | 92 nonCopyingSort(effects.begin(), effects.end(), compareEffects); |
93 for (const auto& effect : effects) { | 93 for (const auto& effect : effects) { |
94 if (effect->priority() != priority || (suppressedAnimationPlayers &&
effect->animation() && suppressedAnimationPlayers->contains(effect->animation()
->player()))) | 94 if (effect->priority() != priority || (suppressedAnimationPlayers &&
effect->animation() && suppressedAnimationPlayers->contains(effect->animation()
->player()))) |
95 continue; | 95 continue; |
96 copyToActiveInterpolationMap(effect->interpolations(), result); | 96 copyToActiveInterpolationMap(effect->interpolations(), result); |
97 } | 97 } |
98 } | 98 } |
99 | 99 |
100 if (newAnimations) | 100 if (newAnimations) |
(...skipping 22 matching lines...) Expand all Loading... |
123 FloatBox expandingBox(originalBox); | 123 FloatBox expandingBox(originalBox); |
124 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand
ingBox, *anim->effect(), startRange, endRange)) | 124 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand
ingBox, *anim->effect(), startRange, endRange)) |
125 return false; | 125 return false; |
126 box.expandTo(expandingBox); | 126 box.expandTo(expandingBox); |
127 } | 127 } |
128 } | 128 } |
129 return true; | 129 return true; |
130 } | 130 } |
131 | 131 |
132 } // namespace blink | 132 } // namespace blink |
OLD | NEW |