From: rolandsteiner@chromium.org <rolandsteiner@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 24 Feb 2012 02:20:19 +0000 (+0000)
Subject: Unreviewed: add clause in ASSERT missing from r108474.
X-Git-Tag: 070512121124~11968
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e1918881357295f4d970e186018697f94a03353;p=profile%2Fivi%2Fwebkit-efl.git

Unreviewed: add clause in ASSERT missing from r108474.

No new tests. (fix)

* html/HTMLStyleElement.cpp:
(WebCore::HTMLStyleElement::willRemove):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a208686..91a5c6c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-23  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Unreviewed: add clause in ASSERT missing from r108474.
+
+        No new tests. (fix)
+
+        * html/HTMLStyleElement.cpp:
+        (WebCore::HTMLStyleElement::willRemove):
+
 2012-02-23  Eric Seidel  <eric@webkit.org>
 
         Split out HTML constructors into new DOMWindowHTML suplemental idl
diff --git a/Source/WebCore/html/HTMLStyleElement.cpp b/Source/WebCore/html/HTMLStyleElement.cpp
index f663984..2070d56 100644
--- a/Source/WebCore/html/HTMLStyleElement.cpp
+++ b/Source/WebCore/html/HTMLStyleElement.cpp
@@ -162,7 +162,7 @@ void HTMLStyleElement::willRemove()
     // That is, because willRemove() is also called if an ancestor is removed from the document.
     // Now, if we want to register <style scoped> even if it's not inDocument,
     // we'd need to find a way to discern whether that is the case, or whether <style scoped> itself is about to be removed.
-    ASSERT(!scoped() || !inDocument() || m_isRegisteredWithScopingNode);
+    ASSERT(!scoped() || !inDocument() || m_isRegisteredWithScopingNode || !RuntimeEnabledFeatures::styleScopedEnabled());
     if (m_isRegisteredWithScopingNode)
         unregisterWithScopingNode();
     HTMLElement::willRemove();