Source/core/dom/Element.cpp - Issue 139743017: Don't propagate Inherit ad infinitum.

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/dom/Element.cpp

Issue 139743017: Don't propagate Inherit ad infinitum. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Don't abuse timeline tests Created 6 years, 11 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/dom/Element.cpp

diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp

index aff399f4b84719b13b22ab2811853fd989851923..ebdb3a0f525af79c9bf072abcb6fb6a00dca48d5 100644

--- a/Source/core/dom/Element.cpp

+++ b/Source/core/dom/Element.cpp

@@ -1649,7 +1649,10 @@ StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change)

}

if (styleChangeType() >= SubtreeStyleChange)

- return document().ensureStyleResolver().treeBoundaryCrossingRules().isEmpty() ? Inherit : Force;

+ return Force;

+ if (change <= Inherit)

+ return localChange;

return max(localChange, change);

}