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

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

Issue 298723011: Make 'will-change: contents' suppress compositing in subtree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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/StyleBuilderCustom.cpp
diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
index f2e2356769bafca0dac608ae8c4a8e84bef5ab44..6163567943ed497c7297bdc9e5573c23305b4aaf 100644
--- a/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -1081,6 +1081,7 @@ void StyleBuilderFunctions::applyInitialCSSPropertyWillChange(StyleResolverState
state.style()->setWillChangeContents(false);
state.style()->setWillChangeScrollPosition(false);
state.style()->setWillChangeProperties(Vector<CSSPropertyID>());
+ state.style()->setSubtreeWillChangeContents(state.parentStyle()->subtreeWillChangeContents());
esprehn 2014/05/23 01:05:58 I don't think this is correct, we don't go through
ajuma 2014/05/23 14:38:31 For the normal case, RenderStyle::inheritFrom alre
}
void StyleBuilderFunctions::applyInheritCSSPropertyWillChange(StyleResolverState& state)
@@ -1088,6 +1089,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyWillChange(StyleResolverState
state.style()->setWillChangeContents(state.parentStyle()->willChangeContents());
state.style()->setWillChangeScrollPosition(state.parentStyle()->willChangeScrollPosition());
state.style()->setWillChangeProperties(state.parentStyle()->willChangeProperties());
+ state.style()->setSubtreeWillChangeContents(state.parentStyle()->subtreeWillChangeContents());
}
void StyleBuilderFunctions::applyValueCSSPropertyWillChange(StyleResolverState& state, CSSValue* value)
@@ -1111,6 +1113,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWillChange(StyleResolverState&
state.style()->setWillChangeContents(willChangeContents);
state.style()->setWillChangeScrollPosition(willChangeScrollPosition);
state.style()->setWillChangeProperties(willChangeProperties);
+ state.style()->setSubtreeWillChangeContents(willChangeContents || state.parentStyle()->subtreeWillChangeContents());
}
void StyleBuilderFunctions::applyInitialCSSPropertyContent(StyleResolverState& state)

Powered by Google App Engine
This is Rietveld 408576698