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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 325cfbfb988dc894dc5954f808066ad24696b5cf
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 17 08:05:06 2002 +0000

    	- fixed 3075992 -- Hang in khtml::RenderFlow::lowestPosition() trying to
    	render http://avoyagetoarcturus.blogspot.com/
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::lowestPosition): Don't recurse on the same child twice.
            (RenderFlow::rightmostPosition): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2352 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c4f386f..0a792a1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3075992 -- Hang in khtml::RenderFlow::lowestPosition() trying to
+	render http://avoyagetoarcturus.blogspot.com/
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::lowestPosition): Don't recurse on the same child twice.
+        (RenderFlow::rightmostPosition): Ditto.
+
 2002-10-17  David Hyatt  <hyatt at apple.com>
 
 	Fix bayarea.com.  My implementation of offsetParent was
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c4f386f..0a792a1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-10-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3075992 -- Hang in khtml::RenderFlow::lowestPosition() trying to
+	render http://avoyagetoarcturus.blogspot.com/
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::lowestPosition): Don't recurse on the same child twice.
+        (RenderFlow::rightmostPosition): Ditto.
+
 2002-10-17  David Hyatt  <hyatt at apple.com>
 
 	Fix bayarea.com.  My implementation of offsetParent was
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c4f386f..0a792a1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-10-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3075992 -- Hang in khtml::RenderFlow::lowestPosition() trying to
+	render http://avoyagetoarcturus.blogspot.com/
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::lowestPosition): Don't recurse on the same child twice.
+        (RenderFlow::rightmostPosition): Ditto.
+
 2002-10-17  David Hyatt  <hyatt at apple.com>
 
 	Fix bayarea.com.  My implementation of offsetParent was
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index cd7ea96..3ac0196 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -806,8 +806,9 @@ RenderFlow::lowestPosition() const
     int bottom = RenderBox::lowestPosition();
     //kdDebug(0) << renderName() << "("<<this<<") lowest = " << bottom << endl;
     int lp = 0;
+    RenderObject *last = 0;
     if ( !m_childrenInline ) {
-        RenderObject *last = lastChild();
+        last = lastChild();
         while( last && (last->isPositioned() || last->isFloating()) )
             last = last->previousSibling();
         if( last )
@@ -838,7 +839,7 @@ RenderFlow::lowestPosition() const
     if ( overhangingContents() ) {
         RenderObject *child = firstChild();
         while( child ) {
-	    if ( child->overhangingContents() ) {
+	    if ( child != last && child->overhangingContents() ) {
 		int lp = child->yPos() + child->lowestPosition();
 		if ( lp > bottom ) bottom = lp;
 	    }
@@ -881,7 +882,7 @@ int RenderFlow::rightmostPosition() const
     if ( overhangingContents() ) {
         RenderObject *child = firstChild();
         while( child ) {
-	    if ( child->overhangingContents() ) {
+	    if ( (child->isPositioned() || child->isFloating()) && child->overhangingContents() ) {
 		int r = child->xPos() + child->rightmostPosition();
 		if ( r > right ) right = r;
 	    }

-- 
WebKit Debian packaging