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

Unified Diff: sky/engine/core/frame/FrameView.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/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index ea35547b3f5a055db6ce1962a64cc4e12bbda366..71c7438ff0fad01591293c67c87526cc7511c1ac 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -28,6 +28,7 @@
#include "sky/engine/core/frame/FrameView.h"
#include "gen/sky/platform/RuntimeEnabledFeatures.h"
+#include "sky/engine/core/animation/DocumentAnimations.h"
#include "sky/engine/core/css/FontFaceSet.h"
#include "sky/engine/core/css/resolver/StyleResolver.h"
#include "sky/engine/core/dom/DocumentMarkerController.h"
@@ -798,7 +799,7 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
}
RELEASE_ASSERT(!needsLayout());
- ASSERT(document->lifecycle().state() >= DocumentLifecycle::CompositingClean);
+ ASSERT(document->lifecycle().state() >= DocumentLifecycle::PaintInvalidationClean);
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Paint", "data", InspectorPaintEvent::data(renderView, rect));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
@@ -877,6 +878,8 @@ void FrameView::updateLayoutAndStyleForPainting()
}
ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
+
+ DocumentAnimations::startPendingAnimations(*m_frame->document());
}
void FrameView::updateLayoutAndStyleIfNeededRecursive()

Powered by Google App Engine
This is Rietveld 408576698