Source/WebCore/css/StyleResolver.cpp - Issue 11280303: Merge 136074

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/css/StyleResolver.cpp

Issue 11280303: Merge 136074 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/

Patch Set: Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/WebCore/css/StyleResolver.cpp

===================================================================

--- Source/WebCore/css/StyleResolver.cpp (revision 136563)

+++ Source/WebCore/css/StyleResolver.cpp (working copy)

@@ -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() ?

« no previous file with comments | « LayoutTests/fast/css/font-size-nan-expected.txt ('k') | no next file » | no next file with comments »