[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 2a6f2b2cd3e91e13ef0272920893e2e0f583a028
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 21:24:50 2009 +0000

    2009-12-11  Simon Fraser  <simon.fraser at apple.com>
    
            Build fix, no review.
    
            Build fix for platforms where ACCELERATED_COMPOSITING is not defined.
    
            * page/animation/ImplicitAnimation.cpp:
            (WebCore::ImplicitAnimation::startAnimation):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 595b18f..985b1f6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2009-12-11  Simon Fraser  <simon.fraser at apple.com>
 
+        Build fix, no review.
+
+        Build fix for platforms where ACCELERATED_COMPOSITING is not defined.
+
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::startAnimation):
+
+2009-12-11  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Darin Adler.
 
         Negative values for animation-delay are ignored (treated as zero)
diff --git a/WebCore/page/animation/ImplicitAnimation.cpp b/WebCore/page/animation/ImplicitAnimation.cpp
index d39f5fc..8d00533 100644
--- a/WebCore/page/animation/ImplicitAnimation.cpp
+++ b/WebCore/page/animation/ImplicitAnimation.cpp
@@ -115,7 +115,7 @@ bool ImplicitAnimation::startAnimation(double timeOffset)
             return layer->backing()->startTransition(timeOffset, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
     }
 #else
-    UNUSED_PARAM(beginTime);
+    UNUSED_PARAM(timeOffset);
 #endif
     return false;
 }

-- 
WebKit Debian packaging