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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 sampledEffect->effect()->hasActiveAnimationsOnCompositor(property)) | 97 sampledEffect->effect()->hasActiveAnimationsOnCompositor(property)) |
98 return true; | 98 return true; |
99 } | 99 } |
100 return false; | 100 return false; |
101 } | 101 } |
102 | 102 |
103 ActiveInterpolationsMap AnimationStack::activeInterpolations( | 103 ActiveInterpolationsMap AnimationStack::activeInterpolations( |
104 AnimationStack* animationStack, | 104 AnimationStack* animationStack, |
105 const HeapVector<Member<const InertEffect>>* newAnimations, | 105 const HeapVector<Member<const InertEffect>>* newAnimations, |
106 const HeapHashSet<Member<const Animation>>* suppressedAnimations, | 106 const HeapHashSet<Member<const Animation>>* suppressedAnimations, |
107 KeyframeEffect::Priority priority, | 107 KeyframeEffectReadOnly::Priority priority, |
108 PropertyHandleFilter propertyHandleFilter) { | 108 PropertyHandleFilter propertyHandleFilter) { |
109 ActiveInterpolationsMap result; | 109 ActiveInterpolationsMap result; |
110 | 110 |
111 if (animationStack) { | 111 if (animationStack) { |
112 HeapVector<Member<SampledEffect>>& sampledEffects = | 112 HeapVector<Member<SampledEffect>>& sampledEffects = |
113 animationStack->m_sampledEffects; | 113 animationStack->m_sampledEffects; |
114 // std::sort doesn't work with OwnPtrs | 114 // std::sort doesn't work with OwnPtrs |
115 nonCopyingSort(sampledEffects.begin(), sampledEffects.end(), | 115 nonCopyingSort(sampledEffects.begin(), sampledEffects.end(), |
116 compareSampledEffects); | 116 compareSampledEffects); |
117 animationStack->removeRedundantSampledEffects(); | 117 animationStack->removeRedundantSampledEffects(); |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 if (!CompositorAnimations::getAnimatedBoundingBox( | 172 if (!CompositorAnimations::getAnimatedBoundingBox( |
173 expandingBox, *effect->model(), startRange, endRange)) | 173 expandingBox, *effect->model(), startRange, endRange)) |
174 return false; | 174 return false; |
175 box.expandTo(expandingBox); | 175 box.expandTo(expandingBox); |
176 } | 176 } |
177 } | 177 } |
178 return true; | 178 return true; |
179 } | 179 } |
180 | 180 |
181 } // namespace blink | 181 } // namespace blink |
OLD | NEW |