Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(926)

Unified Diff: sky/engine/core/animation/DocumentAnimations.cpp

Issue 772673002: Fix Animations, Remove Compostior Animations. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cleanup Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/animation/DocumentAnimations.cpp
diff --git a/sky/engine/core/animation/DocumentAnimations.cpp b/sky/engine/core/animation/DocumentAnimations.cpp
index ab8a32e817f40d6553652bdcb81da939ca4f7665..482ad125f2919214da6b0d0957f1ebfe6e73e338 100644
--- a/sky/engine/core/animation/DocumentAnimations.cpp
+++ b/sky/engine/core/animation/DocumentAnimations.cpp
@@ -64,20 +64,6 @@ void DocumentAnimations::updateOutdatedAnimationPlayersIfNeeded(Document& docume
updateAnimationTiming(document, TimingUpdateOnDemand);
}
-void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CSSPropertyID property)
-{
- if (!node.isElementNode())
- return;
- const Element& element = toElement(node);
- if (RenderStyle* style = element.renderStyle()) {
- if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationOnCompositor())
- || ((property == CSSPropertyTransform || property == CSSPropertyWebkitTransform) && style->isRunningTransformAnimationOnCompositor())
- || (property == CSSPropertyWebkitFilter && style->isRunningFilterAnimationOnCompositor())) {
- updateAnimationTiming(element.document(), TimingUpdateOnDemand);
- }
- }
-}
-
bool DocumentAnimations::needsOutdatedAnimationPlayerUpdate(const Document& document)
{
return document.timeline().hasOutdatedAnimationPlayer();
@@ -86,7 +72,7 @@ bool DocumentAnimations::needsOutdatedAnimationPlayerUpdate(const Document& docu
// FIXME: Rename to updateCompositorAnimations
void DocumentAnimations::startPendingAnimations(Document& document)
{
- ASSERT(document.lifecycle().state() == DocumentLifecycle::CompositingClean);
+ ASSERT(document.lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
if (document.compositorPendingAnimations().update()) {
ASSERT(document.view());
document.view()->scheduleAnimation();

Powered by Google App Engine
This is Rietveld 408576698