Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/page/animation/KeyframeAnimation.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 167 matching lines @@
             return true;
     }
     
     return false;
 }
 
 bool KeyframeAnimation::startAnimation(double beginTime)
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->hasLayer()) {
-        RenderLayer* layer = toRenderBoxModelObject(m_object)->layer();
+        RenderLayer* layer = toRenderBox(m_object)->layer();
         if (layer->isComposited())
             return layer->backing()->startAnimation(beginTime, m_animation.get(), m_keyframes);
     }
 #else
     UNUSED_PARAM(beginTime);
 #endif
     return false;
 }
 
 void KeyframeAnimation::endAnimation(bool reset)
 {
     if (m_object) {
 #if USE(ACCELERATED_COMPOSITING)
         if (m_object->hasLayer()) {
-            RenderLayer* layer = toRenderBoxModelObject(m_object)->layer();
+            RenderLayer* layer = toRenderBox(m_object)->layer();
             if (layer->isComposited())
                 layer->backing()->animationFinished(m_keyframes.animationName(), 0, reset);
         }
 #else
         UNUSED_PARAM(reset);
 #endif
         // Restore the original (unanimated) style
         setChanged(m_object->element());
     }
 }
@@ skipping 151 matching lines @@
 
     if (acceleratedPropertiesOnly) {
         bool isLooping;
         getTimeToNextEvent(t, isLooping);
     }
 #endif
     return t;
 }
 
 } // namespace WebCore