| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 } | 83 } |
| 84 } | 84 } |
| 85 | 85 |
| 86 } // namespace | 86 } // namespace |
| 87 | 87 |
| 88 AnimationStack::AnimationStack() {} | 88 AnimationStack::AnimationStack() {} |
| 89 | 89 |
| 90 bool AnimationStack::hasActiveAnimationsOnCompositor( | 90 bool AnimationStack::hasActiveAnimationsOnCompositor( |
| 91 CSSPropertyID property) const { | 91 CSSPropertyID property) const { |
| 92 for (const auto& sampledEffect : m_sampledEffects) { | 92 for (const auto& sampledEffect : m_sampledEffects) { |
| 93 // TODO(dstockwell): move the playing check into AnimationEffectReadOnly and
expose both hasAnimations and hasActiveAnimations | 93 // TODO(dstockwell): move the playing check into AnimationEffectReadOnly and |
| 94 // expose both hasAnimations and hasActiveAnimations |
| 94 if (sampledEffect->effect() && | 95 if (sampledEffect->effect() && |
| 95 sampledEffect->effect()->animation()->playing() && | 96 sampledEffect->effect()->animation()->playing() && |
| 96 sampledEffect->effect()->hasActiveAnimationsOnCompositor(property)) | 97 sampledEffect->effect()->hasActiveAnimationsOnCompositor(property)) |
| 97 return true; | 98 return true; |
| 98 } | 99 } |
| 99 return false; | 100 return false; |
| 100 } | 101 } |
| 101 | 102 |
| 102 ActiveInterpolationsMap AnimationStack::activeInterpolations( | 103 ActiveInterpolationsMap AnimationStack::activeInterpolations( |
| 103 AnimationStack* animationStack, | 104 AnimationStack* animationStack, |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 if (!CompositorAnimations::getAnimatedBoundingBox( | 172 if (!CompositorAnimations::getAnimatedBoundingBox( |
| 172 expandingBox, *effect->model(), startRange, endRange)) | 173 expandingBox, *effect->model(), startRange, endRange)) |
| 173 return false; | 174 return false; |
| 174 box.expandTo(expandingBox); | 175 box.expandTo(expandingBox); |
| 175 } | 176 } |
| 176 } | 177 } |
| 177 return true; | 178 return true; |
| 178 } | 179 } |
| 179 | 180 |
| 180 } // namespace blink | 181 } // namespace blink |
| OLD | NEW |