Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / shadow / InsertionPoint.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp b/src/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
index 8cc0fb4..4099b88 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
+++ b/src/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
@@ -146,7 +146,8 @@ bool InsertionPoint::isActive() const
     if (!canBeActive())
         return false;
     ShadowRoot* shadowRoot = containingShadowRoot();
-    ASSERT(shadowRoot);
+    if (!shadowRoot)
+        return false;
     if (!hasTagName(shadowTag) || shadowRoot->descendantShadowElementCount() <= 1)
         return true;
 
@@ -251,7 +252,7 @@ void InsertionPoint::parseAttribute(const QualifiedName& name, const AtomicStrin
     if (name == reset_style_inheritanceAttr) {
         if (!inDocument() || !isActive())
             return;
-        containingShadowRoot()->host()->setNeedsStyleRecalc();
+        containingShadowRoot()->host()->setNeedsStyleRecalc(SubtreeStyleChange);
     } else
         HTMLElement::parseAttribute(name, value);
 }