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

Unified Diff: Source/WebCore/page/animation/AnimationBase.cpp

Issue 10696154: Merge 120639 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 months 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: Source/WebCore/page/animation/AnimationBase.cpp
===================================================================
--- Source/WebCore/page/animation/AnimationBase.cpp (revision 122239)
+++ Source/WebCore/page/animation/AnimationBase.cpp (working copy)
@@ -191,7 +191,7 @@
// Trigger a render so we can start the animation
if (m_object)
- m_compAnim->animationController()->addNodeChangeToDispatch(m_object->styledGeneratingNode());
+ m_compAnim->animationController()->addNodeChangeToDispatch(m_object->node());
} else {
ASSERT(!paused());
// We're waiting for the start timer to fire and we got a pause. Cancel the timer, pause and wait
@@ -252,7 +252,7 @@
// Dispatch updateStyleIfNeeded so we can start the animation
if (m_object)
- m_compAnim->animationController()->addNodeChangeToDispatch(m_object->styledGeneratingNode());
+ m_compAnim->animationController()->addNodeChangeToDispatch(m_object->node());
} else {
// We are pausing while waiting for a start response. Cancel the animation and wait. When
// we unpause, we will act as though the start timer just fired
@@ -298,7 +298,7 @@
resumeOverriddenAnimations();
// Fire off another style change so we can set the final value
- m_compAnim->animationController()->addNodeChangeToDispatch(m_object->styledGeneratingNode());
+ m_compAnim->animationController()->addNodeChangeToDispatch(m_object->node());
}
} else {
// We are pausing while running. Cancel the animation and wait
« no previous file with comments | « LayoutTests/transitions/first-letter-transition-expected.txt ('k') | Source/WebCore/page/animation/AnimationController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698