[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 8a069af419b6cccac551f9eeb29fcf8b928172ba
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon May 10 23:19:27 2004 +0000

    	Make sure that when finished parsing if all the right conditions are met, we just go ahead and updateRendering and
    	layout.
    
            Reviewed by rjw
    
            * khtml/khtmlview.cpp:
            (KHTMLView::scheduleRelayout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6568 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f605a52..13b8536 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-05-10  David Hyatt  <hyatt at apple.com>
+
+	Make sure that when finished parsing if all the right conditions are met, we just go ahead and updateRendering and
+	layout.
+	
+        Reviewed by rjw
+	
+        * khtml/khtmlview.cpp:
+        (KHTMLView::scheduleRelayout):
+
 2004-05-08  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 84b6560..9bcba1b 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1350,6 +1350,17 @@ void DocumentImpl::closeInternal( bool checkTokenizer )
         m_view->part()->checkEmitLoadEvent();
 }
 
+void DocumentImpl::setParsing(bool b)
+{
+    if (m_bParsing != b) {
+        m_bParsing = b;
+        if (!b && haveStylesheetsLoaded() && 
+            (!ownerElement() || (ownerElement()->renderer() && !ownerElement()->renderer()->needsLayout()) && 
+            renderer() && renderer()->needsLayout())
+            updateLayout();
+    }
+}
+    
 void DocumentImpl::write( const DOMString &text )
 {
     write(text.string());
diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index 564dc11..cad8538 100644
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -338,7 +338,7 @@ public:
     void setHTMLMode( HTMLMode m ) { hMode = m; }
     HTMLMode htmlMode() const { return hMode; }
 
-    void setParsing(bool b) { m_bParsing = b; }
+    void setParsing(bool b);
     bool parsing() const { return m_bParsing; }
 
     void setTextColor( QColor color ) { m_textColor = color; }

-- 
WebKit Debian packaging