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

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

index dadc1ec303a7ca5137b07683f4f382574e585638..ae20056edddef5b30dd220bca15ca79ec56116d9 100644

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

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

@@ -225,11 +225,7 @@ FontDescription::Size StyleBuilderConverter::convertFontSize(StyleResolverState&

{

CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);

- FontDescription::Size parentSize(0, 0.0f, false);

- // FIXME: Find out when parentStyle could be 0?

- if (state.parentStyle())

- parentSize = state.parentFontDescription().size();

+ FontDescription::Size parentSize = state.parentFontDescription().size();

if (CSSValueID valueID = primitiveValue->getValueID()) {

switch (valueID) {