[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 dfb0905efd8edc3c8416012187ccfccde32141eb
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 11 02:58:59 2003 +0000

    	Fix for <pre> regression, bug #3193590, directory listings
    	busted.
    
            Reviewed by gramps
    
            * khtml/rendering/bidi.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 339b15f..9b3efd3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-03-10  David Hyatt  <hyatt at apple.com>
+
+	Fix for <pre> regression, bug #3193590, directory listings
+	busted.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/bidi.cpp:
+
 2003-03-10  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 339b15f..9b3efd3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-03-10  David Hyatt  <hyatt at apple.com>
+
+	Fix for <pre> regression, bug #3193590, directory listings
+	busted.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/bidi.cpp:
+
 2003-03-10  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 31d1b10..4bbe9c7 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1308,18 +1308,19 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren)
                     sFirstBidiRun = sCompactFirstBidiRun;
                     sBidiRunCount += sCompactBidiRunCount;
                 }
-                
-                InlineFlowBox* lineBox = constructLine(start, end);
-                if (!lineBox)
-                    return;
-
-                // Now we position all of our text runs horizontally.
-                computeHorizontalPositionsForLine(lineBox, context);
 
-                // Now position our text runs vertically.
-                computeVerticalPositionsForLine(lineBox);
-
-                deleteBidiRuns(renderArena());
+                if (sBidiRunCount) {
+                    InlineFlowBox* lineBox = constructLine(start, end);
+                    if (lineBox) {
+                        // Now we position all of our text runs horizontally.
+                        computeHorizontalPositionsForLine(lineBox, context);
+        
+                        // Now position our text runs vertically.
+                        computeVerticalPositionsForLine(lineBox);
+        
+                        deleteBidiRuns(renderArena());
+                    }
+                }
                 
                 if( end == start || (end.obj && end.obj->isBR() && !start.obj->isBR() ) ) {
                     adjustEmbeddding = true;

-- 
WebKit Debian packaging