[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 75c30b6e1f3dd78f75f64e07a45aa0a38a70d174
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 20:15:34 2004 +0000

    	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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7038 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1ff4a8a..062d566 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-07-16  David Hyatt  <hyatt at 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 at apple.com>
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index c84d5f4..10a2712 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -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;

-- 
WebKit Debian packaging