Source/core/css/resolver/StyleResolver.cpp - Issue 677103002: Expand system font values during property parsing.

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/css/resolver/StyleResolver.cpp

Issue 677103002: Expand system font values during property parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: OVERRIDE -> override, Allow CSSValueNone in systemFont() Created 6 years, 2 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:

View side-by-side diff with in-line comments

Download patch

« Source/core/css/StylePropertyShorthandCustom.cpp ('K') | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/rendering/RenderTheme.h » ('j') | Source/core/rendering/RenderTheme.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/resolver/StyleResolver.cpp

diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp

index 3268bef9bfc9df1d7fa07db1e891e09913931a60..926a7352f5a888e6b77f4b903e9a3bb8de13e361 100644

--- a/Source/core/css/resolver/StyleResolver.cpp

+++ b/Source/core/css/resolver/StyleResolver.cpp

@@ -1253,7 +1253,7 @@ template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::HighPr

// This method returns the last CSSPropertyId of high priority properties.

template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::HighPriorityProperties>()

{

- COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyColor + 18, CSS_line_height_is_end_of_high_prioity_property_range);

+ COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyColor + 17, CSS_line_height_is_end_of_high_prioity_property_range);

COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyLineHeight - 1, CSS_zoom_is_before_line_height);

return CSSPropertyLineHeight;

}