Merge 120639

Source/WebCore/page/animation/KeyframeAnimation.cpp

Index: Source/WebCore/page/animation/KeyframeAnimation.cpp
===================================================================
--- Source/WebCore/page/animation/KeyframeAnimation.cpp	(revision 122239)
+++ Source/WebCore/page/animation/KeyframeAnimation.cpp	(working copy)
@@ -51,8 +51,8 @@
     , 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();
@@ -255,7 +255,7 @@
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 void KeyframeAnimation::endAnimation()
@@ -269,7 +269,7 @@
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 bool KeyframeAnimation::shouldSendEventForListener(Document::ListenerType listenerType) const
@@ -314,8 +314,8 @@
     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)