Source/core/editing/EditingStyle.cpp - Issue 468793003: Make style building for 'font-size' less custom.

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/core/editing/EditingStyle.cpp

Issue 468793003: Make style building for 'font-size' less custom. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix regression related to FontDescriptions with isAbsolute=true. Created 6 years, 3 months 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/core/editing/EditingStyle.cpp

diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp

index 62bcb4341fb7757daa519e048fe3431c1187782e..d2424c3d7a47b415cd47304a6208af3b8241947f 100644

--- a/Source/core/editing/EditingStyle.cpp

+++ b/Source/core/editing/EditingStyle.cpp

@@ -1638,8 +1638,7 @@ int legacyFontSizeFromCSSValue(Document* document, CSSPrimitiveValue* value, Fix

int pixelFontSize = value->getIntValue(CSSPrimitiveValue::CSS_PX);

int legacyFontSize = FontSize::legacyFontSize(document, pixelFontSize, fixedPitchFontType);

// Use legacy font size only if pixel value matches exactly to that of legacy font size.

- CSSValueID cssPrimitiveEquivalent = static_cast<CSSValueID>(legacyFontSize - 1 + CSSValueXSmall);

- if (mode == AlwaysUseLegacyFontSize || FontSize::fontSizeForKeyword(document, cssPrimitiveEquivalent, fixedPitchFontType) == pixelFontSize)

+ if (mode == AlwaysUseLegacyFontSize || FontSize::fontSizeForKeyword(document, legacyFontSize, fixedPitchFontType) == pixelFontSize)

return legacyFontSize;

return 0;

« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »