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

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

Issue 1869773004: Move shadowCascadeOrder to Document from StyleEngine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ASSERT and insert DCHECK_NE Created 4 years, 8 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 | « no previous file | third_party/WebKit/Source/core/dom/Document.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index 9d1221ce31a13f1de9c41a9c53bc1c221a96a4cf..0fea015ee3232792e21c805d18038169265c13bb 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -503,7 +503,7 @@ void StyleResolver::matchScopedRules(const Element& element, ElementRuleCollecto
ScopedStyleResolver* elementScopeResolver = scopedResolverFor(element);
- if (!document().styleEngine().mayContainV0Shadow()) {
+ if (!document().mayContainV0Shadow()) {
matchSlottedRules(element, collector);
matchElementScopeRules(element, elementScopeResolver, collector);
return;
@@ -548,7 +548,7 @@ void StyleResolver::matchScopedRules(const Element& element, ElementRuleCollecto
void StyleResolver::matchAuthorRules(const Element& element, ElementRuleCollector& collector)
{
- if (document().styleEngine().shadowCascadeOrder() != ShadowCascadeOrder::ShadowCascadeV1) {
+ if (document().shadowCascadeOrder() != ShadowCascadeOrder::ShadowCascadeV1) {
matchAuthorRulesV0(element, collector);
return;
}
@@ -633,7 +633,7 @@ void StyleResolver::matchAllRules(StyleResolverState& state, ElementRuleCollecto
if (state.element()->isStyledElement()) {
// For Shadow DOM V1, inline style is already collected in matchScopedRules().
- if (document().styleEngine().shadowCascadeOrder() != ShadowCascadeOrder::ShadowCascadeV1 && state.element()->inlineStyle()) {
+ if (document().shadowCascadeOrder() != ShadowCascadeOrder::ShadowCascadeV1 && state.element()->inlineStyle()) {
// Inline style is immutable as long as there is no CSSOM wrapper.
bool isInlineStyleCacheable = !state.element()->inlineStyle()->isMutable();
collector.addElementStyleProperties(state.element()->inlineStyle(), isInlineStyleCacheable);
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698