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

Unified Diff: Source/core/dom/shadow/ShadowRoot.cpp

Issue 201683003: Remove resetStyleInheritance. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Resolve conflicts Created 6 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
« no previous file with comments | « Source/core/dom/shadow/ShadowRoot.h ('k') | Source/core/dom/shadow/ShadowRoot.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/shadow/ShadowRoot.cpp
diff --git a/Source/core/dom/shadow/ShadowRoot.cpp b/Source/core/dom/shadow/ShadowRoot.cpp
index c781db09eb017b6ff29737f52bc90e334661e05c..05c549722492176647e4cd85a3bfc285ac87d480 100644
--- a/Source/core/dom/shadow/ShadowRoot.cpp
+++ b/Source/core/dom/shadow/ShadowRoot.cpp
@@ -57,7 +57,6 @@ ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
, m_next(0)
, m_numberOfStyles(0)
, m_applyAuthorStyles(false)
- , m_resetStyleInheritance(false)
, m_type(type)
, m_registeredWithParentShadowRoot(false)
, m_descendantInsertionPointsIsValid(false)
@@ -142,11 +141,6 @@ void ShadowRoot::recalcStyle(StyleRecalcChange change)
// ShadowRoot doesn't support custom callbacks.
ASSERT(!hasCustomStyleCallbacks());
- // If we're propagating an Inherit change and this ShadowRoot resets
- // inheritance we don't need to look at the children.
- if (change <= Inherit && resetStyleInheritance() && !needsStyleRecalc() && !childNeedsStyleRecalc())
- return;
-
StyleResolver& styleResolver = document().ensureStyleResolver();
styleResolver.pushParentShadowRoot(*this);
@@ -216,21 +210,6 @@ void ShadowRoot::setApplyAuthorStyles(bool value)
setNeedsStyleRecalc(SubtreeStyleChange);
}
-void ShadowRoot::setResetStyleInheritance(bool value)
-{
- if (isOrphan())
- return;
-
- if (value == resetStyleInheritance())
- return;
-
- m_resetStyleInheritance = value;
- if (!isActiveForStyling())
- return;
-
- setNeedsStyleRecalc(SubtreeStyleChange);
-}
-
void ShadowRoot::attach(const AttachContext& context)
{
StyleResolver& styleResolver = document().ensureStyleResolver();
« no previous file with comments | « Source/core/dom/shadow/ShadowRoot.h ('k') | Source/core/dom/shadow/ShadowRoot.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698