Merge 120639

Source/WebCore/page/animation/KeyframeAnimation.cpp

 /*
  * Copyright (C) 2007, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 33 matching lines @@
 namespace WebCore {
 
 KeyframeAnimation::KeyframeAnimation(const Animation* animation, RenderObject* renderer, int index, CompositeAnimation* compAnim, RenderStyle* unanimatedStyle)
     : AnimationBase(animation, renderer, compAnim)
     , m_keyframes(renderer, animation->name())
     , m_index(index)
     , m_startEventDispatched(false)
     , m_unanimatedStyle(unanimatedStyle)
 {
     // Get the keyframe RenderStyles
-    if (m_object && m_object->styledGeneratingNode() && m_object->styledGeneratingNode()->isElementNode())
-        m_object->document()->styleResolver()->keyframeStylesForAnimation(static_cast<Element*>(m_object->styledGeneratingNode()), unanimatedStyle, m_keyframes);
+    if (m_object && m_object->node() && m_object->node()->isElementNode())
+        m_object->document()->styleResolver()->keyframeStylesForAnimation(static_cast<Element*>(m_object->node()), unanimatedStyle, m_keyframes);
 
     // Update the m_transformFunctionListValid flag based on whether the function lists in the keyframes match.
     validateTransformFunctionList();
 #if ENABLE(CSS_FILTERS)
     checkForMatchingFilterFunctionLists();
 #endif
 }
 
 KeyframeAnimation::~KeyframeAnimation()
 {
@@ skipping 182 matching lines @@
         return;
 
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object->isComposited())
         toRenderBoxModelObject(m_object)->animationPaused(timeOffset, m_keyframes.animationName());
 #else
     UNUSED_PARAM(timeOffset);
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 void KeyframeAnimation::endAnimation()
 {
     if (!m_object)
         return;
 
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object->isComposited())
         toRenderBoxModelObject(m_object)->animationFinished(m_keyframes.animationName());
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 bool KeyframeAnimation::shouldSendEventForListener(Document::ListenerType listenerType) const
 {
     return m_object->document()->hasListenerType(listenerType);
 }
 
 void KeyframeAnimation::onAnimationStart(double elapsedTime)
 {
     sendAnimationEvent(eventNames().webkitAnimationStartEvent, elapsedTime);
@@ skipping 24 matching lines @@
         ASSERT(eventType == eventNames().webkitAnimationStartEvent);
         if (m_startEventDispatched)
             return false;
         m_startEventDispatched = true;
         listenerType = Document::ANIMATIONSTART_LISTENER;
     }
 
     if (shouldSendEventForListener(listenerType)) {
         // Dispatch the event
         RefPtr<Element> element;
-        if (m_object->styledGeneratingNode() && m_object->styledGeneratingNode()->isElementNode())
-            element = static_cast<Element*>(m_object->styledGeneratingNode());
+        if (m_object->node() && m_object->node()->isElementNode())
+            element = static_cast<Element*>(m_object->node());
 
         ASSERT(!element || (element->document() && !element->document()->inPageCache()));
         if (!element)
             return false;
 
         // Schedule event handling
         m_compAnim->animationController()->addEventToDispatch(element, eventType, m_keyframes.animationName(), elapsedTime);
 
         // Restore the original (unanimated) style
         if (eventType == eventNames().webkitAnimationEndEvent && element->renderer())
@@ skipping 129 matching lines @@
 
     if (acceleratedPropertiesOnly) {
         bool isLooping;
         getTimeToNextEvent(t, isLooping);
     }
 #endif
     return t;
 }
 
 } // namespace WebCore