Title: [145633] branches/safari-536.30-branch
- Revision
- 145633
- Author
- [email protected]
- Date
- 2013-03-12 17:29:22 -0700 (Tue, 12 Mar 2013)
Log Message
Merged r136074. <rdar://problem/13334908>
Modified Paths
Added Paths
Diff
Modified: branches/safari-536.30-branch/LayoutTests/ChangeLog (145632 => 145633)
--- branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-03-13 00:27:13 UTC (rev 145632)
+++ branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-03-13 00:29:22 UTC (rev 145633)
@@ -1,5 +1,19 @@
2013-03-12 Lucas Forschler <[email protected]>
+ Merge r136074
+
+ 2012-11-28 Kenichi Ishibashi <[email protected]>
+
+ StyleResolver should not set NaN to font size
+ https://bugs.webkit.org/show_bug.cgi?id=99506
+
+ Reviewed by Abhishek Arya.
+
+ * fast/css/font-size-nan-expected.txt: Added.
+ * fast/css/font-size-nan.svg: Added.
+
+2013-03-12 Lucas Forschler <[email protected]>
+
Merge r136061
2012-11-28 Tom Sepez <[email protected]>
Copied: branches/safari-536.30-branch/LayoutTests/fast/css/font-size-nan-expected.txt (from rev 136074, trunk/LayoutTests/fast/css/font-size-nan-expected.txt) (0 => 145633)
--- branches/safari-536.30-branch/LayoutTests/fast/css/font-size-nan-expected.txt (rev 0)
+++ branches/safari-536.30-branch/LayoutTests/fast/css/font-size-nan-expected.txt 2013-03-13 00:29:22 UTC (rev 145633)
@@ -0,0 +1,2 @@
+PASS: WebKit doesn't crash.
+
Copied: branches/safari-536.30-branch/LayoutTests/fast/css/font-size-nan.svg (from rev 136074, trunk/LayoutTests/fast/css/font-size-nan.svg) (0 => 145633)
--- branches/safari-536.30-branch/LayoutTests/fast/css/font-size-nan.svg (rev 0)
+++ branches/safari-536.30-branch/LayoutTests/fast/css/font-size-nan.svg 2013-03-13 00:29:22 UTC (rev 145633)
@@ -0,0 +1,11 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<samp style="-webkit-line-clamp: 69; font: 27160em Ahem;"><emptycustomtag><foobar style="-webkit-box-shadow: 1662977863 125px 111px mediumorchid, 112 130px 6px royalblue; zoom: 183.924360629; "><acronym style="-webkit-hyphenate-limit-lines: 207; -webkit-text-size-adjust: none;"><code><highlight></highlight><href></href></code></acronym></foobar>
+<div>PASS: WebKit doesn't crash.</div>
+<textarea style="border-image: url() 212 57 14584936043161189249 63/75px stretch stretch; "></textarea></emptycustomtag></samp>
+</html>
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (145632 => 145633)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-13 00:27:13 UTC (rev 145632)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-13 00:29:22 UTC (rev 145633)
@@ -1,5 +1,26 @@
2013-03-12 Lucas Forschler <[email protected]>
+ Merge r136074
+
+ 2012-11-28 Kenichi Ishibashi <[email protected]>
+
+ StyleResolver should not set NaN to font size
+ https://bugs.webkit.org/show_bug.cgi?id=99506
+
+ Reviewed by Abhishek Arya.
+
+ fixedScaleFactor could be NaN since settings->defaultFixedFontSize()
+ and settings->defaultFontSize() are zero in some case. This turns
+ out setting NaN to font size. Add a zero checks so that
+ fixedScaleFactor won't be NaN.
+
+ Test: fast/css/font-size-nan.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::checkForGenericFamilyChange):
+
+2013-03-12 Lucas Forschler <[email protected]>
+
Merge r136061
2012-11-28 Tom Sepez <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/css/StyleResolver.cpp (145632 => 145633)
--- branches/safari-536.30-branch/Source/WebCore/css/StyleResolver.cpp 2013-03-13 00:27:13 UTC (rev 145632)
+++ branches/safari-536.30-branch/Source/WebCore/css/StyleResolver.cpp 2013-03-13 00:29:22 UTC (rev 145633)
@@ -4868,7 +4868,7 @@
size = fontSizeForKeyword(m_checker.document(), CSSValueXxSmall + childFont.keywordSize() - 1, childFont.useFixedDefaultSize());
else {
Settings* settings = m_checker.document()->settings();
- float fixedScaleFactor = settings
+ float fixedScaleFactor = (settings && settings->defaultFixedFontSize() && settings->defaultFontSize())
? static_cast<float>(settings->defaultFixedFontSize()) / settings->defaultFontSize()
: 1;
size = parentFont.useFixedDefaultSize() ?
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
