Source/core/css/MediaQueryEvaluator.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/MediaQueryEvaluator.cpp

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

Patch Set: add test for browser zoom 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:

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

Download patch

« no previous file with comments | « Source/core/css/CSSToLengthConversionData.cpp ('k') | Source/core/css/resolver/FontBuilder.h » ('j') | Source/core/css/resolver/ViewportStyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/MediaQueryEvaluator.cpp

diff --git a/Source/core/css/MediaQueryEvaluator.cpp b/Source/core/css/MediaQueryEvaluator.cpp

index 5673e6e98fcce6a374a17bda7fe294490d169bd1..3ca82604ff9f309b1d696d1a3802c4bf61ec3821 100644

--- a/Source/core/css/MediaQueryEvaluator.cpp

+++ b/Source/core/css/MediaQueryEvaluator.cpp

@@ -350,7 +350,8 @@ static bool computeLength(CSSValue* value, bool strict, RenderStyle* initialStyl

if (primitiveValue->isLength()) {

// Relative (like EM) and root relative (like REM) units are always resolved against

// the initial values for media queries, hence the two initialStyle parameters.

- result = primitiveValue->computeLength<int>(CSSToLengthConversionData(initialStyle, initialStyle, 1.0 /* zoom */, true /* computingFontSize */));

+ // FIXME: We need to plumb viewport unit support down to here.

+ result = primitiveValue->computeLength<int>(CSSToLengthConversionData(initialStyle, initialStyle, 0, 1.0 /* zoom */, true /* computingFontSize */));

return true;

}