Source/core/css/resolver/StyleBuilderCustom.cpp - Issue 82083002: Move viewport unit resolution to style recalc time

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/StyleBuilderCustom.cpp

Issue 82083002: Move viewport unit resolution to style recalc time (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master

Patch Set: actually fix zoom handling Created 7 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/core/css/resolver/StyleBuilderCustom.cpp

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

index 8f239d8cb6440d8e969046c805dcbab652dfb3aa..5e25390c98928e6fbc7db565536ef9698d3d9d39 100755

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

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

@@ -280,8 +280,6 @@ void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState&

lineHeight = Length((state.style()->computedFontSize() * primitiveValue->getIntValue()) / 100.0, Fixed);

} else if (primitiveValue->isNumber()) {

lineHeight = Length(primitiveValue->getDoubleValue() * 100.0, Percent);

- } else if (primitiveValue->isViewportPercentageLength()) {

- lineHeight = primitiveValue->viewportPercentageLength();

} else if (primitiveValue->isCalculated()) {

double multiplier = state.style()->effectiveZoom();

if (Frame* frame = state.document().frame())