2009-02-05 Simon Fraser <simon.fraser@apple.com>
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Feb 2009 04:12:27 +0000 (04:12 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Feb 2009 04:12:27 +0000 (04:12 +0000)
        Minor clenaup: fix brace style in CompositeAnimationPrivate::updateTransitions(),
        and correct a usage of UNUSED_PARAM().

        * page/animation/CompositeAnimation.cpp:
        (WebCore::CompositeAnimationPrivate::updateTransitions):
        * page/animation/ImplicitAnimation.cpp:
        (WebCore::ImplicitAnimation::startAnimation):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@40701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/page/animation/CompositeAnimation.cpp
WebCore/page/animation/ImplicitAnimation.cpp

index 95901b8..d5af591 100644 (file)
@@ -1,5 +1,15 @@
 2009-02-05  Simon Fraser  <simon.fraser@apple.com>
 
+        Minor clenaup: fix brace style in CompositeAnimationPrivate::updateTransitions(),
+        and correct a usage of UNUSED_PARAM().
+
+        * page/animation/CompositeAnimation.cpp:
+        (WebCore::CompositeAnimationPrivate::updateTransitions):
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::startAnimation):
+
+2009-02-05  Simon Fraser  <simon.fraser@apple.com>
+
         Fix build when ACCELERATED_COMPOSITING is turned on.
         
         animationOfPropertyIsAccelerated() needs to be public because
index 8b45317..d966d51 100644 (file)
@@ -183,8 +183,7 @@ void CompositeAnimationPrivate::updateTransitions(RenderObject* renderer, Render
 #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);
 
index 4771519..25b5f9b 100644 (file)
@@ -36,7 +36,6 @@
 #include "KeyframeAnimation.h"
 #include "RenderLayer.h"
 #include "RenderLayerBacking.h"
-
 #include <wtf/UnusedParam.h>
 
 namespace WebCore {
@@ -97,14 +96,14 @@ void ImplicitAnimation::getAnimatedStyle(RefPtr<RenderStyle>& animatedStyle)
 
 bool ImplicitAnimation::startAnimation(double beginTime)
 {
-    UNUSED_PARAM(beginTime);
-    
 #if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->hasLayer()) {
         RenderLayer* layer = toRenderBoxModelObject(m_object)->layer();
         if (layer->isComposited())
             return layer->backing()->startTransition(beginTime, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
     }
+#else
+    UNUSED_PARAM(beginTime);
 #endif
     return false;
 }