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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 53e4ac68ee36148c4323b46e1b487dbfee065b04
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 07:25:13 2004 +0000

            Reviewed by Kevin.
    
    	<rdar://problem/3725467> REGRESSION(140-142) nothing displayed at http://Ye-Olde-Movies.tripod.com
    	<rdar://problem/3599494> REGRESSION (100-125): Frame does not refresh until user clicks on browser.
    
            * khtml/rendering/render_frames.cpp:
            (RenderFrameSet::layout): When returning early because there are
    	no children, make sure to mark self as no longer needing
    	layout. Otherwise, when children are added, we'll fail to
    	propagate childrenNeedLayout to our own parent! This is almost
    	certainly a long-standing bug that was just masked by our old
    	layout tomfoolery.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7108 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 58220ec..6394973 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2004-07-22  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Kevin.
+
+	<rdar://problem/3725467> REGRESSION(140-142) nothing displayed at http://Ye-Olde-Movies.tripod.com
+	<rdar://problem/3599494> REGRESSION (100-125): Frame does not refresh until user clicks on browser.
+	
+        * khtml/rendering/render_frames.cpp:
+        (RenderFrameSet::layout): When returning early because there are
+	no children, make sure to mark self as no longer needing
+	layout. Otherwise, when children are added, we'll fail to
+	propagate childrenNeedLayout to our own parent! This is almost
+	certainly a long-standing bug that was just masked by our old
+	layout tomfoolery.
+
 2004-07-22  Kevin Decker  <kdecker at apple.com>
 
 	Reviewed by Darin
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 2a702b3..e523824 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -218,7 +218,7 @@ void RenderFrameSet::layout( )
 
     RenderObject *child = firstChild();
     if ( !child )
-      return;
+	goto end2;
 
     if(!m_hSplitVar && !m_vSplitVar)
     {

-- 
WebKit Debian packaging