Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/page/animation/CompositeAnimation.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 165 matching lines @@
             if (implAnim) {
                 // This implAnim might not be an already running transition. It might be
                 // newly added to the list in a previous iteration. This would happen if
                 // you have both an explicit transition-property and 'all' in the same
                 // list. In this case, the latter one overrides the earlier one, so we
                 // behave as though this is a running animation being replaced.
                 if (!implAnim->isTargetPropertyEqual(prop, targetStyle)) {
 #if USE(ACCELERATED_COMPOSITING)
                     // For accelerated animations we need to return a new RenderStyle with the _current_ value
                     // of the property, so that restarted transitions use the correct starting point.
-                    if (AnimationBase::animationOfPropertyIsAccelerated(prop)) {
+                    if (AnimationBase::animationOfPropertyIsAccelerated(prop))
+                    {
                         if (!modifiedCurrentStyle)
                             modifiedCurrentStyle = RenderStyle::clone(currentStyle);
 
                         implAnim->blendPropertyValueInStyle(prop, modifiedCurrentStyle.get());
                     }
 #endif
                     m_transitions.remove(prop);
                     equal = false;
                 }
             } else {
@@ skipping 530 matching lines @@
     return m_data->pauseTransitionAtTime(property, t);
 }
 
 unsigned CompositeAnimation::numberOfActiveAnimations() const
 {
     return m_data->numberOfActiveAnimations();
 }
 
 } // namespace WebCore