Fix for 3709337, crash when using display: compact. Need to make sure that the...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jul 2004 20:15:34 +0000 (20:15 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Jul 2004 20:15:34 +0000 (20:15 +0000)
also checking for RenderBlocks, since otherwise you match text nodes (and that's just wrong).

        Reviewed by kocienda

        * khtml/rendering/bidi.cpp:
        (khtml::RenderBlock::layoutInlineChildren):

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

WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/bidi.cpp

index 1ff4a8a..062d566 100644 (file)
@@ -1,3 +1,13 @@
+2004-07-16  David Hyatt  <hyatt@apple.com>
+
+       Fix for 3709337, crash when using display: compact.  Need to make sure that the isCompact() check in bidi.cpp is
+       also checking for RenderBlocks, since otherwise you match text nodes (and that's just wrong).
+       
+        Reviewed by kocienda
+
+        * khtml/rendering/bidi.cpp:
+        (khtml::RenderBlock::layoutInlineChildren):
+
 === Safari-152 ===
 
 2004-07-15  David Hyatt  <hyatt@apple.com>
index c84d5f4..10a2712 100644 (file)
@@ -1447,7 +1447,7 @@ QRect RenderBlock::layoutInlineChildren(bool relayoutChildren)
 
             betweenMidpoints = false;
             isLineEmpty = true;
-            if (m_firstLine && firstChild() && firstChild()->isCompact()) {
+            if (m_firstLine && firstChild() && firstChild()->isCompact() && firstChild()->isRenderBlock()) {
                 buildCompactRuns(firstChild(), bidi);
                 start.obj = firstChild()->nextSibling();
                 end = start;