Index: Source/core/animation/DocumentAnimations.cpp |
diff --git a/Source/core/animation/DocumentAnimations.cpp b/Source/core/animation/DocumentAnimations.cpp |
index 8bf72d2b7c61304bc17f3c35d19386e9fbcda9c5..1d9e19cf57dc8a1e0e61087f6ea13d2adbafb82f 100644 |
--- a/Source/core/animation/DocumentAnimations.cpp |
+++ b/Source/core/animation/DocumentAnimations.cpp |
@@ -50,32 +50,29 @@ void updateAnimationTiming(Document& document) |
{ |
document.timeline()->serviceAnimations(); |
document.transitionTimeline()->serviceAnimations(); |
- if (!document.childNeedsStyleRecalc()) |
- document.animationClock().unfreeze(); |
} |
-void dispatchAnimationEvents(Document& document) |
+} // namespace |
+ |
+void DocumentAnimations::dispatchAnimationEvents(Document& document) |
{ |
document.timeline()->dispatchEvents(); |
document.transitionTimeline()->dispatchEvents(); |
} |
-void dispatchAnimationEventsAsync(Document& document) |
+void DocumentAnimations::dispatchAnimationEventsAsync(Document& document) |
{ |
document.timeline()->dispatchEventsAsync(); |
document.transitionTimeline()->dispatchEventsAsync(); |
} |
-} // namespace |
- |
-void DocumentAnimations::serviceOnAnimationFrame(Document& document, double monotonicAnimationStartTime) |
+void DocumentAnimations::updateAnimationTimingForAnimationFrame(Document& document, double monotonicAnimationStartTime) |
{ |
document.animationClock().updateTime(monotonicAnimationStartTime); |
updateAnimationTiming(document); |
- dispatchAnimationEvents(document); |
} |
-void DocumentAnimations::serviceBeforeGetComputedStyle(Node& node, CSSPropertyID property) |
+void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CSSPropertyID property) |
{ |
if (!node.isElementNode()) |
return; |
@@ -90,13 +87,13 @@ void DocumentAnimations::serviceBeforeGetComputedStyle(Node& node, CSSPropertyID |
} |
} |
-void DocumentAnimations::serviceAfterStyleRecalc(Document& document) |
+void DocumentAnimations::startPendingAnimations(Document& document) |
{ |
+ ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean); |
if (document.cssPendingAnimations().startPendingAnimations() && document.view()) |
esprehn
2014/02/25 00:00:48
You should ASSERT(document().view()) here, it can'
dstockwell
2014/02/25 00:52:03
Done.
|
document.view()->scheduleAnimation(); |
document.animationClock().unfreeze(); |
- dispatchAnimationEventsAsync(document); |
} |
} // namespace WebCore |