Changeset 158099 in webkit

Timestamp:

Oct 27, 2013, 5:17:44 PM (12 years ago)

Author:

akling@apple.com

Message:

Tone down overzealous assertion from r158097.

RenderElement::initializeStyle() really only cares that there are no
text renderers that we should be calling styleDidChange() on.

Tweak the code to only check that there are no text children.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::initializeStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-27  Andreas Kling  <akling@apple.com>
+
+        Tone down overzealous assertion from r158097.
+
+        RenderElement::initializeStyle() really only cares that there are no
+        text renderers that we should be calling styleDidChange() on.
+
+        Tweak the code to only check that there are no text children.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::initializeStyle):
+
 2013-10-27  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -373 +373 @@
     styleDidChange(StyleDifferenceEqual, nullptr);
 
-    // We shouldn't have any text (or other) children that need styleDidChange at this point.
-    ASSERT(!firstChild());
+#if !ASSERT_DISABLED
+    // We shouldn't have any text children that would need styleDidChange at this point.
+    for (RenderObject* child = firstChild(); child; child = child->nextSibling())
+        ASSERT(!child->isText());
+#endif
 
     // It would be nice to assert that !parent() here, but some RenderLayer subrenderers