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

eric.carlson at apple.com eric.carlson at apple.com
Wed Dec 22 11:10:44 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3f025ad1dce4fd45069e4f2ed9a3138975a29a54
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 15:04:09 2010 +0000

    2010-07-14  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix for r63319.
    
            * html/TimeRanges.cpp:
            (TimeRanges::nearest): Include math.h and use narrowPrecisionToFloat.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63320 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a970d22..dce280d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-14  Eric Carlson  <eric.carlson at apple.com>
 
+        Unreviewed, build fix for r63319.
+
+        * html/TimeRanges.cpp:
+        (TimeRanges::nearest): Include math.h and use narrowPrecisionToFloat.
+
+2010-07-14  Eric Carlson  <eric.carlson at apple.com>
+
         Reviewed by Darin Adler.
 
         Update media element's seeking logic
diff --git a/WebCore/html/TimeRanges.cpp b/WebCore/html/TimeRanges.cpp
index 3ae4618..51200f8 100644
--- a/WebCore/html/TimeRanges.cpp
+++ b/WebCore/html/TimeRanges.cpp
@@ -27,6 +27,9 @@
 
 #include "TimeRanges.h"
 
+#include "FloatConversion.h"
+#include <math.h>
+
 using namespace WebCore;
 
 TimeRanges::TimeRanges(float start, float end)
@@ -127,9 +130,9 @@ float TimeRanges::nearest(float time) const
         if (time >= startTime && time <= endTime)
             return time;
         if (fabs(startTime - time) < closest)
-            closest = fabs(startTime - time);
+            closest = narrowPrecisionToFloat(fabs(startTime - time));
         else if (fabs(endTime - time) < closest)
-            closest = fabs(endTime - time);
+            closest = narrowPrecisionToFloat(fabs(endTime - time));
     }
     return closest;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list