| 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();
|
|
|