Source/core/css/resolver/StyleBuilderCustom.cpp - Issue 686723002: Improve RAII of StyleResolverState.

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 686723002: Improve RAII of StyleResolverState. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix assertions. 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:

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

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

index 3cb2703f971e1f92eacb372bc2f66f4831ea7d20..62cc6098d1b8e4faa15dc3da421dee9d29b43f5c 100644

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

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

@@ -603,7 +603,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyVerticalAlign(StyleResolverStat

static void resetEffectiveZoom(StyleResolverState& state)

{

// Reset the zoom in effect. This allows the setZoom method to accurately compute a new zoom in effect.

- state.setEffectiveZoom(state.parentStyle() ? state.parentStyle()->effectiveZoom() : RenderStyle::initialZoom());

+ state.setEffectiveZoom(state.parentStyle()->effectiveZoom());

}

void StyleBuilderFunctions::applyInitialCSSPropertyZoom(StyleResolverState& state)