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

Unified Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 1038193002: Clear baseLayoutStyle when the font selector version has increased. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 033a99604efe96e7d7b243b9e90e29f501bb3993..0b7cbf09d0099053338b25db57de08e736a589d9 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -566,7 +566,7 @@ PassRefPtr<LayoutStyle> StyleResolver::styleForElement(Element* element, const L
StyleResolverState state(document(), elementContext, defaultParent);
ElementAnimations* elementAnimations = element->elementAnimations();
- const LayoutStyle* baseLayoutStyle = elementAnimations ? elementAnimations->baseLayoutStyle() : nullptr;
+ const LayoutStyle* baseLayoutStyle = elementAnimations ? elementAnimations->validateBaseLayoutStyle() : nullptr;
if (baseLayoutStyle) {
state.setStyle(LayoutStyle::clone(*baseLayoutStyle));
@@ -773,7 +773,7 @@ bool StyleResolver::pseudoStyleForElementInternal(Element& element, const Pseudo
Element* pseudoElement = element.pseudoElement(pseudoStyleRequest.pseudoId);
ElementAnimations* elementAnimations = pseudoElement ? pseudoElement->elementAnimations() : nullptr;
- const LayoutStyle* baseLayoutStyle = elementAnimations ? elementAnimations->baseLayoutStyle() : nullptr;
+ const LayoutStyle* baseLayoutStyle = elementAnimations ? elementAnimations->validateBaseLayoutStyle() : nullptr;
if (baseLayoutStyle) {
state.setStyle(LayoutStyle::clone(*baseLayoutStyle));

Powered by Google App Engine
This is Rietveld 408576698