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

Unified Diff: Source/WebCore/page/animation/AnimationController.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/AnimationController.cpp
===================================================================
--- Source/WebCore/page/animation/AnimationController.cpp (revision 122239)
+++ Source/WebCore/page/animation/AnimationController.cpp (working copy)
@@ -100,7 +100,7 @@
timeToNextService = t;
if (!timeToNextService) {
if (callSetChanged == CallSetChanged) {
- Node* node = it->first->styledGeneratingNode();
+ Node* node = it->first->node();
ASSERT(!node || (node->document() && !node->document()->inPageCache()));
node->setNeedsStyleRecalc(SyntheticStyleChange);
calledSetChanged = true;
@@ -328,7 +328,7 @@
return false;
if (compAnim->pauseAnimationAtTime(name, t)) {
- renderer->styledGeneratingNode()->setNeedsStyleRecalc(SyntheticStyleChange);
+ renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
startUpdateStyleIfNeededDispatcher();
return true;
}
@@ -346,7 +346,7 @@
return false;
if (compAnim->pauseTransitionAtTime(cssPropertyID(property), t)) {
- renderer->styledGeneratingNode()->setNeedsStyleRecalc(SyntheticStyleChange);
+ renderer->node()->setNeedsStyleRecalc(SyntheticStyleChange);
startUpdateStyleIfNeededDispatcher();
return true;
}
@@ -508,7 +508,7 @@
return;
if (m_data->clear(renderer)) {
- Node* node = renderer->styledGeneratingNode();
+ Node* node = renderer->node();
ASSERT(!node || (node->document() && !node->document()->inPageCache()));
node->setNeedsStyleRecalc(SyntheticStyleChange);
}
@@ -533,6 +533,7 @@
// against the animations in the style and make sure we're in sync. If destination values
// have changed, we reset the animation. We then do a blend to get new values and we return
// a new style.
+ ASSERT(renderer->node()); // FIXME: We do not animate generated content yet.
RefPtr<CompositeAnimation> rendererAnimations = m_data->accessCompositeAnimation(renderer);
RefPtr<RenderStyle> blendedStyle = rendererAnimations->animate(renderer, oldStyle, newStyle);
« no previous file with comments | « Source/WebCore/page/animation/AnimationBase.cpp ('k') | Source/WebCore/page/animation/ImplicitAnimation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698