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

dino at apple.com dino at apple.com
Wed Dec 22 13:13:04 UTC 2010


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

    2010-09-08  Dean Jackson  <dino at apple.com>
    
            Unreviewed attempt to fix the Mac builds.
    
            * css/CSSParser.cpp:
            (WebCore::CSSParser::parseAnimationTimingFunction):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67036 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ea0ded3..fec0f85 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-09-08  Dean Jackson  <dino at apple.com>
 
+        Unreviewed attempt to fix the Mac builds.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseAnimationTimingFunction):
+
+2010-09-08  Dean Jackson  <dino at apple.com>
+
         Unreviewed attempt to fix QT build.
 
         * platform/graphics/qt/GraphicsLayerQt.cpp:
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 95a2784..7c35739 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -2827,7 +2827,7 @@ PassRefPtr<CSSValue> CSSParser::parseAnimationTimingFunction()
         CSSParserValue* v = args->current();
         if (!validUnit(v, FInteger, m_strict))
             return 0;
-        numSteps = min(v->fValue, (double)INT_MAX);
+        numSteps = (int) min(v->fValue, (double)INT_MAX);
         if (numSteps < 1)
             return 0;
         v = args->next();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list