[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dino at apple.com]

The following commit has been merged in the debian/experimental branch:
commit bf5d89185d0836422717eb9451fec1c3505ea8fd
Author: dino at apple.com <dino at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 23:28:10 2010 +0000

    2010-09-08  Dean Jackson  <dino at apple.com>
    
            Unreviewed attempt to fix QT build.
    
            * platform/graphics/qt/GraphicsLayerQt.cpp:
            (WebCore::solveStepsFunction):
            (WebCore::applyTimingFunction):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2b6ef3..ea0ded3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-08  Dean Jackson  <dino at apple.com>
 
+        Unreviewed attempt to fix QT build.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::solveStepsFunction):
+        (WebCore::applyTimingFunction):
+
+2010-09-08  Dean Jackson  <dino at apple.com>
+
         Reviewed by Simon Fraser.
 
         Implement steps() timing function for animations
diff --git a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 151b1df..e164f8c 100644
--- a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -1233,7 +1233,7 @@ static inline double solveCubicBezierFunction(qreal p1x, qreal p1y, qreal p2x, q
 static inline double solveStepsFunction(int numSteps, bool stepAtStart, double t)
 {
     if (stepAtStart)
-        return min(1.0, (floor(numSteps * t) + 1) / numSteps);
+        return qMin(1.0, (floor(numSteps * t) + 1) / numSteps);
     return floor(numSteps * t) / numSteps;
 }
 
@@ -1251,7 +1251,7 @@ static inline qreal applyTimingFunction(const TimingFunction* timingFunction, qr
                                         ctf->x2(),
                                         ctf->y2(),
                                         double(progress), double(duration) / 1000);
-    } else if (tf->isStepsTimingFunction()) {
+    } else if (timingFunction->isStepsTimingFunction()) {
         const StepsTimingFunction* stf = static_cast<const StepsTimingFunction*>(timingFunction);
         return solveStepsFunction(stf->numberOfSteps(), stf->stepAtStart(), double(progress));
     } else

-- 
WebKit Debian packaging