summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 19:33:59 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 19:33:59 +0000
commit6244ce8896c0c128ffb1a50c79dcc39956b3ab4b (patch)
tree9ab749686d64cc2b638abff0f40cf90ecb491263
parenta87a2e31535c8db76e9f62f80b39df1c11f301c4 (diff)
downloadchromium_src-6244ce8896c0c128ffb1a50c79dcc39956b3ab4b.zip
chromium_src-6244ce8896c0c128ffb1a50c79dcc39956b3ab4b.tar.gz
chromium_src-6244ce8896c0c128ffb1a50c79dcc39956b3ab4b.tar.bz2
Fix _finite() v. finite() differences between unix/win.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1234 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/port/platform/graphics/SkiaUtils.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/port/platform/graphics/SkiaUtils.h b/webkit/port/platform/graphics/SkiaUtils.h
index d6b94b2..6284a86 100644
--- a/webkit/port/platform/graphics/SkiaUtils.h
+++ b/webkit/port/platform/graphics/SkiaUtils.h
@@ -32,6 +32,7 @@
#ifndef SkiaUtils_h
#define SkiaUtils_h
+#include "base/float_util.h"
#include "GraphicsContext.h"
#include "SkPath.h"
#include "SkShader.h"
@@ -73,11 +74,11 @@ inline PlatformContextSkia* PlatformContextToPlatformContextSkia(
// Skia has problems when passed infinite, etc floats, filter them to 0.
inline SkScalar WebCoreFloatToSkScalar(const float& f) {
- return SkFloatToScalar(_finite(f) ? f : 0);
+ return SkFloatToScalar(base::IsFinite(f) ? f : 0);
}
inline SkScalar WebCoreDoubleToSkScalar(const double& d) {
- return SkDoubleToScalar(_finite(d) ? d : 0);
+ return SkDoubleToScalar(base::IsFinite(d) ? d : 0);
}
// Intersects the given source rect with the region, returning the smallest