Revert "Make compositingState explicit (re-land #2 with bogus ASSERT removed)"

Source/core/frame/animation/AnimationBase.cpp

 /*
  * Copyright (C) 2007, 2008, 2009 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 537 matching lines @@
         m_animState = AnimationStateStartWaitResponse;
         onAnimationStartResponse(beginAnimationUpdateTime());
     }
 
     ASSERT(m_startTime);        // if m_startTime is zero, we haven't started yet, so we'll get a bad pause time.
     if (t <= m_animation->delay())
         m_pauseTime = m_startTime;
     else
         m_pauseTime = m_startTime + t - m_animation->delay();
 
-    // It is possible that m_isAccelerated is true and m_object->compositingState() is NotComposited, because of style change.
-    // So, both conditions need to be checked.
-    if (m_object && m_object->compositingState() == PaintsIntoOwnBacking && isAccelerated())
+    // It is possible that m_isAccelerated is true and m_object->isComposited() is false, because of style change.
+    if (m_object && m_object->isComposited() && isAccelerated())
         toRenderBoxModelObject(m_object)->suspendAnimations(m_pauseTime);
 }
 
 double AnimationBase::beginAnimationUpdateTime() const
 {
     if (!m_compAnim)
         return 0;
 
     return m_compAnim->animationController()->beginAnimationUpdateTime();
 }
 
 double AnimationBase::getElapsedTime() const
 {
     ASSERT(!postActive());
     if (paused())
         return m_pauseTime - m_startTime;
     if (m_startTime <= 0)
         return 0;
 
     double elapsedTime = beginAnimationUpdateTime() - m_startTime;
     // It's possible for the start time to be ahead of the last update time
     // if the compositor has just sent notification for the start of an
     // accelerated animation.
     return max(elapsedTime, 0.0);
 }
 
 } // namespace WebCore