Merge 116698

Source/WebCore/platform/graphics/FontDescription.h

Index: Source/WebCore/platform/graphics/FontDescription.h
===================================================================
--- Source/WebCore/platform/graphics/FontDescription.h	(revision 118284)
+++ Source/WebCore/platform/graphics/FontDescription.h	(working copy)
@@ -138,8 +138,8 @@
     FontDescription makeNormalFeatureSettings() const;
 
     void setFamily(const FontFamily& family) { m_familyList = family; }
-    void setComputedSize(float s) { ASSERT(isfinite(s)); m_computedSize = s; }
-    void setSpecifiedSize(float s) { ASSERT(isfinite(s)); m_specifiedSize = s; }
+    void setComputedSize(float s) { m_computedSize = clampToFloat(s); }
+    void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); }
     void setItalic(FontItalic i) { m_italic = i; }
     void setItalic(bool i) { setItalic(i ? FontItalicOn : FontItalicOff); }
     void setSmallCaps(FontSmallCaps c) { m_smallCaps = c; }