[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:47 UTC 2010


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

    2010-07-14  Eric Carlson  <eric.carlson at apple.com>
    
            One more unreviewed build fix for r63319.
    
            * html/TimeRanges.cpp:
            (TimeRanges::nearest):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63323 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 76d65aa..80cf559 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-14  Eric Carlson  <eric.carlson at apple.com>
+
+        One more unreviewed build fix for r63319.
+
+        * html/TimeRanges.cpp:
+        (TimeRanges::nearest):
+
 2010-07-14  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/html/TimeRanges.cpp b/WebCore/html/TimeRanges.cpp
index 51200f8..1e18306 100644
--- a/WebCore/html/TimeRanges.cpp
+++ b/WebCore/html/TimeRanges.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2009 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2009, 2010 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,7 +27,6 @@
 
 #include "TimeRanges.h"
 
-#include "FloatConversion.h"
 #include <math.h>
 
 using namespace WebCore;
@@ -130,9 +129,9 @@ float TimeRanges::nearest(float time) const
         if (time >= startTime && time <= endTime)
             return time;
         if (fabs(startTime - time) < closest)
-            closest = narrowPrecisionToFloat(fabs(startTime - time));
+            closest = fabsf(startTime - time);
         else if (fabs(endTime - time) < closest)
-            closest = narrowPrecisionToFloat(fabs(endTime - time));
+            closest = fabsf(endTime - time);
     }
     return closest;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list