[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 9e808b6adf77e83d086ee9ceb0913913b5150de9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 29 21:47:10 2003 +0000

    	Refine the fix to updateLayout.
    	updateStyleSelector would get called over and over again when you queried for layout properties from
    	JS.  If no stylesheets are pending, this isn't necessary (and is quite expensive, since updateStyleSelector
    	is a slow function).
    
            Reviewed by darin
    
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::updateLayout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 153a752..450b998 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-10-29  David Hyatt  <hyatt at apple.com>
 
+	Refine the fix to updateLayout.
+	updateStyleSelector would get called over and over again when you queried for layout properties from
+	JS.  If no stylesheets are pending, this isn't necessary (and is quite expensive, since updateStyleSelector
+	is a slow function).
+	
+        Reviewed by darin
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::updateLayout):
+
+2003-10-29  David Hyatt  <hyatt at apple.com>
+
 	Fix crasher in border collapsing code.
 	
         Reviewed by kocienda
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index d0fe0e5..9470bc1 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1040,10 +1040,9 @@ void DocumentImpl::updateDocumentsRendering()
 void DocumentImpl::updateLayout()
 {
     bool oldIgnore = m_ignorePendingStylesheets;
-
-    m_ignorePendingStylesheets = true;
     
-    if (!oldIgnore) {
+    if (!haveStylesheetsLoaded()) {
+        m_ignorePendingStylesheets = true;
 	updateStyleSelector();    
     }
 

-- 
WebKit Debian packaging