[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 c3731d436d2eb05d22613af3ca68d33de33b0e20
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 12 06:20:22 2002 +0000

    	Fix hang on monkeyvoodoo.net and on skramkoob.com.  The bugs
    	are 3105714 and 3045965.  Also fix margin collapsing churn
    	on thestar by not laying out a second time when collapsing
    	margins make you move unless you contain floats.
    
            Reviewed by: gramps
    
            * khtml/rendering/bidi.cpp:
            (RenderFlow::findNextLineBreak):
    	* khtml/rendering/render_flow.cpp:
    	(RenderFlow::layoutBlockChildren);
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d95eb57..99a5609 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-12-11  David Hyatt  <hyatt at apple.com>
+
+	Fix hang on monkeyvoodoo.net and on skramkoob.com.  The bugs
+	are 3105714 and 3045965.  Also fix margin collapsing churn
+	on thestar by not laying out a second time when collapsing
+	margins make you move unless you contain floats.
+	
+        Reviewed by: gramps
+
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+	* khtml/rendering/render_flow.cpp:
+	(RenderFlow::layoutBlockChildren);
+
 2002-12-11  Richard Williamson   <rjw at apple.com>
 
         Fixed 3124121, 3124716 (and other dupes).  Regressions related to b/f crash.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d95eb57..99a5609 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-12-11  David Hyatt  <hyatt at apple.com>
+
+	Fix hang on monkeyvoodoo.net and on skramkoob.com.  The bugs
+	are 3105714 and 3045965.  Also fix margin collapsing churn
+	on thestar by not laying out a second time when collapsing
+	margins make you move unless you contain floats.
+	
+        Reviewed by: gramps
+
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+	* khtml/rendering/render_flow.cpp:
+	(RenderFlow::layoutBlockChildren);
+
 2002-12-11  Richard Williamson   <rjw at apple.com>
 
         Fixed 3124121, 3124716 (and other dupes).  Regressions related to b/f crash.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 242ec0f..8cbfb34 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1439,7 +1439,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
                 lBreak.pos = pos - 1;
             } else {
                 lBreak.obj = last;
-                lBreak.pos = last->length();
+                lBreak.pos = last->isText() ? last->length() : 0;
             }
         } else if( lBreak.obj ) {
             if( last != o ) {
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 74bc4da..0e7c82c 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -638,7 +638,7 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
             }
             
             child->setPos(child->xPos(), ypos);
-            if (ypos != yPosEstimate) {
+            if (ypos != yPosEstimate && (child->containsSpecial() || containsSpecial())) {
                 // Our guess was wrong. Make the child lay itself out again.
                 // XXXdwh some debugging code for this.
                 // printf("WE WERE WRONG for object %d (%d, %d)!\n", (int)child, yPosEstimate, ypos);

-- 
WebKit Debian packaging