Title: [118286] branches/chromium/1132
- Revision
- 118286
- Author
- [email protected]
- Date
- 2012-05-23 17:46:32 -0700 (Wed, 23 May 2012)
Log Message
Merge 116698
BUG=125921
Review URL: https://chromiumcodereview.appspot.com/10452002
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1132/LayoutTests/fast/css/large-font-size-crash-expected.txt (from rev 116698, trunk/LayoutTests/fast/css/large-font-size-crash-expected.txt) (0 => 118286)
--- branches/chromium/1132/LayoutTests/fast/css/large-font-size-crash-expected.txt (rev 0)
+++ branches/chromium/1132/LayoutTests/fast/css/large-font-size-crash-expected.txt 2012-05-24 00:46:32 UTC (rev 118286)
@@ -0,0 +1 @@
+PASS. WebKit didn't crash.
Copied: branches/chromium/1132/LayoutTests/fast/css/large-font-size-crash.html (from rev 116698, trunk/LayoutTests/fast/css/large-font-size-crash.html) (0 => 118286)
--- branches/chromium/1132/LayoutTests/fast/css/large-font-size-crash.html (rev 0)
+++ branches/chromium/1132/LayoutTests/fast/css/large-font-size-crash.html 2012-05-24 00:46:32 UTC (rev 118286)
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<body style='font: 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999in Ahem;'>
+PASS. WebKit didn't crash.
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+</body>
+</html>
Modified: branches/chromium/1132/Source/WebCore/platform/graphics/FontDescription.h (118285 => 118286)
--- branches/chromium/1132/Source/WebCore/platform/graphics/FontDescription.h 2012-05-24 00:43:41 UTC (rev 118285)
+++ branches/chromium/1132/Source/WebCore/platform/graphics/FontDescription.h 2012-05-24 00:46:32 UTC (rev 118286)
@@ -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; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
