Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

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: Fixed test review issues. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/css/recalc-inherit-001-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « LayoutTests/fast/css/recalc-inherit-001-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698