Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/page/animation/AnimationBase.h

 /*
  * 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 153 matching lines @@
     double getElapsedTime() const;
     
     AnimationBase* next() const { return m_next; }
     void setNext(AnimationBase* animation) { m_next = animation; }
     
     void styleAvailable() 
     {
         ASSERT(waitingForStyleAvailable());
         updateStateMachine(AnimationBase::AnimationStateInputStyleAvailable, -1);
     }
-
-#if USE(ACCELERATED_COMPOSITING)
-    static bool animationOfPropertyIsAccelerated(int prop);
-#endif
-
+    
 protected:
     virtual void overrideAnimations() { }
     virtual void resumeOverriddenAnimations() { }
 
     CompositeAnimation* compositeAnimation() { return m_compAnim; }
 
     // These are called when the corresponding timer fires so subclasses can do any extra work
     virtual void onAnimationStart(double /*elapsedTime*/) { }
     virtual void onAnimationIteration(double /*elapsedTime*/) { }
     virtual void onAnimationEnd(double /*elapsedTime*/) { }
     virtual bool startAnimation(double /*beginTime*/) { return false; }
     virtual void endAnimation(bool /*reset*/, double /*forcePauseTime*/ = -1) { }
 
     void goIntoEndingOrLoopingState();
 
     bool isFallbackAnimating() const { return m_fallbackAnimating; }
 
     static bool propertiesEqual(int prop, const RenderStyle* a, const RenderStyle* b);
     static int getPropertyAtIndex(int, bool& isShorthand);
     static int getNumProperties();
 
     // Return true if we need to start software animation timers
     static bool blendProperties(const AnimationBase* anim, int prop, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress);
 
+#if USE(ACCELERATED_COMPOSITING)
+    static bool animationOfPropertyIsAccelerated(int prop);
+#endif
+
     static void setChanged(Node*);
     
     void getTimeToNextEvent(double& time, bool& isLooping) const;
 
     AnimState m_animState;
 
     bool m_isAnimating;       // transition/animation requires continual timer firing
     double m_startTime;
     double m_pauseTime;
     double m_requestedStartTime;
     RenderObject* m_object;
 
     RefPtr<Animation> m_animation;
     CompositeAnimation* m_compAnim;
     bool m_fallbackAnimating;       // true if any animation returned false from startAnimation()
     bool m_transformFunctionListValid;
     double m_totalDuration, m_nextIterationDuration;
     
     AnimationBase* m_next;
 };
 
 } // namespace WebCore
 
 #endif // AnimationBase_h