Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/page/animation/AnimationBase.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 25 matching lines @@
 #include "CString.h"
 #include "CompositeAnimation.h"
 #include "Document.h"
 #include "EventNames.h"
 #include "FloatConversion.h"
 #include "Frame.h"
 #include "IdentityTransformOperation.h"
 #include "ImplicitAnimation.h"
 #include "KeyframeAnimation.h"
 #include "MatrixTransformOperation.h"
-#include "RenderBox.h"
+#include "RenderObject.h"
 #include "RenderStyle.h"
 #include "UnitBezier.h"
 
 #include <algorithm>
 
 using namespace std;
 
 namespace WebCore {
 
 // The epsilon value we pass to UnitBezier::solve given that the animation is going to run over |dur| seconds. The longer the
@@ skipping 1010 matching lines @@
     if (m_startTime <= 0)
         return 0;
     if (postActive())
         return 1;
     return beginAnimationUpdateTime() - m_startTime;
 }
     
 } // namespace WebCore