WebKit merge 40668:40722 part 1.

third_party/WebKit/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 18 matching lines @@
 #include "config.h"
 
 #include "AnimationControllerPrivate.h"
 #include "CompositeAnimation.h"
 #include "CSSPropertyNames.h"
 #include "EventNames.h"
 #include "ImplicitAnimation.h"
 #include "KeyframeAnimation.h"
 #include "RenderLayer.h"
 #include "RenderLayerBacking.h"
-
 #include <wtf/UnusedParam.h>
 
 namespace WebCore {
 
 ImplicitAnimation::ImplicitAnimation(const Animation* transition, int animatingProperty, RenderObject* renderer, CompositeAnimation* compAnim, RenderStyle* fromStyle)
     : AnimationBase(transition, renderer, compAnim)
     , m_transitionProperty(transition->property())
     , m_animatingProperty(animatingProperty)
     , m_overridden(false)
     , m_fromStyle(fromStyle)
@@ skipping 40 matching lines @@
 void ImplicitAnimation::getAnimatedStyle(RefPtr<RenderStyle>& animatedStyle)
 {
     if (!animatedStyle)
         animatedStyle = RenderStyle::clone(m_toStyle.get());
 
     blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
 }
 
 bool ImplicitAnimation::startAnimation(double beginTime)
 {
-    UNUSED_PARAM(beginTime);
-    
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->hasLayer()) {
-        RenderLayer* layer = toRenderBox(m_object)->layer();
+        RenderLayer* layer = toRenderBoxModelObject(m_object)->layer();
         if (layer->isComposited())
             return layer->backing()->startTransition(beginTime, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
     }
+#else
+    UNUSED_PARAM(beginTime);
 #endif
     return false;
 }
 
 void ImplicitAnimation::endAnimation(bool /*reset*/)
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->hasLayer()) {
-        RenderLayer* layer = toRenderBox(m_object)->layer();
+        RenderLayer* layer = toRenderBoxModelObject(m_object)->layer();
         if (layer->isComposited())
             layer->backing()->transitionFinished(m_animatingProperty);
     }
 #endif
 }
 
 void ImplicitAnimation::onAnimationEnd(double elapsedTime)
 {
     // If we have a keyframe animation on this property, this transition is being overridden. The keyframe
     // animation keeps an unanimated style in case a transition starts while the keyframe animation is
@@ skipping 131 matching lines @@
     if (animationOfPropertyIsAccelerated(m_animatingProperty)) {
         bool isLooping;
         getTimeToNextEvent(t, isLooping);
     }
 #endif
     return t;
 }
 
 } // namespace WebCore