Merge 120639

Source/WebCore/page/animation/ImplicitAnimation.cpp

 /*
  * Copyright (C) 2007 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 111 matching lines @@
         return;
 
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object->isComposited())
         toRenderBoxModelObject(m_object)->transitionPaused(timeOffset, m_animatingProperty);
 #else
     UNUSED_PARAM(timeOffset);
 #endif
     // Restore the original (unanimated) style
     if (!paused())
-        setNeedsStyleRecalc(m_object->styledGeneratingNode());
+        setNeedsStyleRecalc(m_object->node());
 }
 
 void ImplicitAnimation::endAnimation()
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->isComposited())
         toRenderBoxModelObject(m_object)->transitionFinished(m_animatingProperty);
 #endif
 }
 
@@ skipping 15 matching lines @@
 bool ImplicitAnimation::sendTransitionEvent(const AtomicString& eventType, double elapsedTime)
 {
     if (eventType == eventNames().webkitTransitionEndEvent) {
         Document::ListenerType listenerType = Document::TRANSITIONEND_LISTENER;
 
         if (shouldSendEventForListener(listenerType)) {
             String propertyName = getPropertyName(m_animatingProperty);
                 
             // Dispatch the event
             RefPtr<Element> element = 0;
-            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, propertyName, elapsedTime);
 
             // Restore the original (unanimated) style
             if (eventType == eventNames().webkitTransitionEndEvent && element->renderer())
@@ skipping 119 matching lines @@
     // only need service at the end of the transition.
     if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(m_animatingProperty) && isAccelerated()) {
         bool isLooping;
         getTimeToNextEvent(t, isLooping);
     }
 #endif
     return t;
 }
 
 } // namespace WebCore