Title: [136566] branches/chromium/1312
- Revision
- 136566
- Author
- [email protected]
- Date
- 2012-12-04 14:05:45 -0800 (Tue, 04 Dec 2012)
Log Message
Merge 136074
BUG=153566
Review URL: https://codereview.chromium.org/11280303
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1312/LayoutTests/fast/css/font-size-nan-expected.txt (from rev 136074, trunk/LayoutTests/fast/css/font-size-nan-expected.txt) (0 => 136566)
--- branches/chromium/1312/LayoutTests/fast/css/font-size-nan-expected.txt (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/css/font-size-nan-expected.txt 2012-12-04 22:05:45 UTC (rev 136566)
@@ -0,0 +1,2 @@
+PASS: WebKit doesn't crash.
+
Copied: branches/chromium/1312/LayoutTests/fast/css/font-size-nan.svg (from rev 136074, trunk/LayoutTests/fast/css/font-size-nan.svg) (0 => 136566)
--- branches/chromium/1312/LayoutTests/fast/css/font-size-nan.svg (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/css/font-size-nan.svg 2012-12-04 22:05:45 UTC (rev 136566)
@@ -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/chromium/1312/Source/WebCore/css/StyleResolver.cpp (136565 => 136566)
--- branches/chromium/1312/Source/WebCore/css/StyleResolver.cpp 2012-12-04 22:04:41 UTC (rev 136565)
+++ branches/chromium/1312/Source/WebCore/css/StyleResolver.cpp 2012-12-04 22:05:45 UTC (rev 136566)
@@ -3967,7 +3967,7 @@
size = fontSizeForKeyword(m_checker.document(), CSSValueXxSmall + childFont.keywordSize() - 1, childFont.useFixedDefaultSize());
else {
Settings* settings = documentSettings();
- 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]
http://lists.webkit.org/mailman/listinfo/webkit-changes
