| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 } // namespace | 53 } // namespace |
| 54 | 54 |
| 55 void DocumentAnimations::updateAnimationTimingForAnimationFrame(Document& docume
nt, double monotonicAnimationStartTime) | 55 void DocumentAnimations::updateAnimationTimingForAnimationFrame(Document& docume
nt, double monotonicAnimationStartTime) |
| 56 { | 56 { |
| 57 document.animationClock().updateTime(monotonicAnimationStartTime); | 57 document.animationClock().updateTime(monotonicAnimationStartTime); |
| 58 updateAnimationTiming(document, TimingUpdateForAnimationFrame); | 58 updateAnimationTiming(document, TimingUpdateForAnimationFrame); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void DocumentAnimations::updateAnimationTimingIfNeeded(Document& document) | 61 void DocumentAnimations::updateAnimationTimingIfNeeded(Document& document) |
| 62 { | 62 { |
| 63 if (needsOutdatedAnimationPlayerUpdate(document) || document.timeline().need
sAnimationTimingUpdate()) | 63 if (needsOutdatedAnimationUpdate(document) || document.timeline().needsAnima
tionTimingUpdate()) |
| 64 updateAnimationTiming(document, TimingUpdateOnDemand); | 64 updateAnimationTiming(document, TimingUpdateOnDemand); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CS
SPropertyID property) | 67 void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CS
SPropertyID property) |
| 68 { | 68 { |
| 69 if (!node.isElementNode()) | 69 if (!node.isElementNode()) |
| 70 return; | 70 return; |
| 71 const Element& element = toElement(node); | 71 const Element& element = toElement(node); |
| 72 if (const ComputedStyle* style = element.computedStyle()) { | 72 if (const ComputedStyle* style = element.computedStyle()) { |
| 73 if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationO
nCompositor()) | 73 if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationO
nCompositor()) |
| 74 || (property == CSSPropertyTransform && style->isRunningTransformAni
mationOnCompositor()) | 74 || (property == CSSPropertyTransform && style->isRunningTransformAni
mationOnCompositor()) |
| 75 || (property == CSSPropertyWebkitFilter && style->isRunningFilterAni
mationOnCompositor())) { | 75 || (property == CSSPropertyWebkitFilter && style->isRunningFilterAni
mationOnCompositor())) { |
| 76 updateAnimationTiming(element.document(), TimingUpdateOnDemand); | 76 updateAnimationTiming(element.document(), TimingUpdateOnDemand); |
| 77 } | 77 } |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 | 80 |
| 81 bool DocumentAnimations::needsOutdatedAnimationPlayerUpdate(const Document& docu
ment) | 81 bool DocumentAnimations::needsOutdatedAnimationUpdate(const Document& document) |
| 82 { | 82 { |
| 83 return document.timeline().hasOutdatedAnimationPlayer(); | 83 return document.timeline().hasOutdatedAnimation(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void DocumentAnimations::updateCompositorAnimations(Document& document) | 86 void DocumentAnimations::updateCompositorAnimations(Document& document) |
| 87 { | 87 { |
| 88 ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean); | 88 ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean); |
| 89 if (document.compositorPendingAnimations().update()) { | 89 if (document.compositorPendingAnimations().update()) { |
| 90 ASSERT(document.view()); | 90 ASSERT(document.view()); |
| 91 document.view()->scheduleAnimation(); | 91 document.view()->scheduleAnimation(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 document.timeline().scheduleNextService(); | 94 document.timeline().scheduleNextService(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 } // namespace blink | 97 } // namespace blink |
| OLD | NEW |