[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 f08b04f4d73887059ac741cb414addf370fefba4
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 21:50:18 2009 +0000

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 28eb831..6c871ed 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-11  Simon Fraser  <simon.fraser at apple.com>
+
+        Build fix for platforms where ACCELERATED_COMPOSITING is not defined.
+
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::pauseAnimation):
+
 2009-12-11  Adam Roben  <aroben at apple.com>
 
         Windows build fix
diff --git a/WebCore/page/animation/KeyframeAnimation.cpp b/WebCore/page/animation/KeyframeAnimation.cpp
index 227fd2b..7537bbc 100644
--- a/WebCore/page/animation/KeyframeAnimation.cpp
+++ b/WebCore/page/animation/KeyframeAnimation.cpp
@@ -217,6 +217,8 @@ void KeyframeAnimation::pauseAnimation(double timeOffset)
         if (layer->isComposited())
             layer->backing()->animationPaused(timeOffset, m_keyframes.animationName());
     }
+#else
+    UNUSED_PARAM(timeOffset);
 #endif
     // Restore the original (unanimated) style
     if (!paused())

-- 
WebKit Debian packaging