[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 b4d514a051704c76b66c4aa6781afe2903070f80
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 22:20:35 2004 +0000

    	Fix for 3726471, need to ensure that it's safe to do updateRendering from within layout, since isContentEditable
    	relies on it.  The fix is to just recalcStyle up front before beginning the layout, so that all of our renderobjects
    	will be up-to-date.
    
            Reviewed by john
    
            * khtml/khtmlview.cpp:
            (KHTMLView::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7046 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b6eac38..3b9cda3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-07-16  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3726471, need to ensure that it's safe to do updateRendering from within layout, since isContentEditable
+	relies on it.  The fix is to just recalcStyle up front before beginning the layout, so that all of our renderobjects
+	will be up-to-date.
+	
+        Reviewed by john
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::layout):
+
 2004-07-16  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 6c3fccb..8120d40 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -579,6 +579,11 @@ void KHTMLView::layout()
         return;
     }
 
+    // Always ensure our style info is up-to-date.  This can happen in situations where
+    // the layout beats any sort of style recalc update that needs to occur.
+    if (document->hasChangedChild())
+        document->recalcStyle();
+
     khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas*>(document->renderer());
     if (!root) {
         // FIXME: Do we need to set _width or _height here?

-- 
WebKit Debian packaging