[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 177a8b906baf6ad4af1d3ed288d94841e8a0b217
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 18 04:01:49 2002 +0000

    	Make immediate repainting of the root element more robust.
    
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::close):
            * khtml/khtmlview.cpp:
            (KHTMLView::unscheduleRepaint):
            * khtml/khtmlview.h:
            * khtml/rendering/render_root.cpp:
            (RenderRoot::repaint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2723 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ce0ea9c..d8c7b79 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
+	Make immediate repainting of the root element more robust.
+	
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/khtmlview.cpp:
+        (KHTMLView::unscheduleRepaint):
+        * khtml/khtmlview.h:
+        * khtml/rendering/render_root.cpp:
+        (RenderRoot::repaint):
+
 2002-11-17  Darin Adler  <darin at apple.com>
 
 	- moved all NSURL and CFURL use out of WebCore
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ce0ea9c..d8c7b79 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
+	Make immediate repainting of the root element more robust.
+	
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/khtmlview.cpp:
+        (KHTMLView::unscheduleRepaint):
+        * khtml/khtmlview.h:
+        * khtml/rendering/render_root.cpp:
+        (RenderRoot::repaint):
+
 2002-11-17  Darin Adler  <darin at apple.com>
 
 	- moved all NSURL and CFURL use out of WebCore
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ce0ea9c..d8c7b79 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
+	Make immediate repainting of the root element more robust.
+	
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/khtmlview.cpp:
+        (KHTMLView::unscheduleRepaint):
+        * khtml/khtmlview.h:
+        * khtml/rendering/render_root.cpp:
+        (RenderRoot::repaint):
+
 2002-11-17  Darin Adler  <darin at apple.com>
 
 	- moved all NSURL and CFURL use out of WebCore
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 2ae1668..18018e5 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -321,8 +321,13 @@ void HTMLDocumentImpl::close()
     DocumentImpl::close();
 
     // Now do our painting
-    if (body() && doload)
+    if (body() && doload) {
         updateRendering();
+        
+        // Always do a full and immediate repaint after loading.
+        if (renderer())
+            renderer()->repaint(true);
+    }
 }
 
 
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index f30c22f..6ddfccf 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -1497,8 +1497,6 @@ void KHTMLView::scheduleRelayout()
     d->timerId = startTimer( parsing ? 1000 : 0 );
 }
 
-#if APPLE_CHANGES
-
 void KHTMLView::unscheduleRelayout()
 {
     if (!d->timerId)
@@ -1508,7 +1506,14 @@ void KHTMLView::unscheduleRelayout()
     d->timerId = 0;
 }
 
-#endif
+void KHTMLView::unscheduleRepaint()
+{
+    if (!d->repaintTimerId)
+        return;
+
+    killTimer(d->repaintTimerId);
+    d->repaintTimerId = 0;
+}
 
 void KHTMLView::scheduleRepaint(int x, int y, int w, int h)
 {
diff --git a/WebCore/khtml/khtmlview.h b/WebCore/khtml/khtmlview.h
index a812acf..c510838 100644
--- a/WebCore/khtml/khtmlview.h
+++ b/WebCore/khtml/khtmlview.h
@@ -192,12 +192,11 @@ private:
     void resetCursor();
 
     void scheduleRelayout();
-#if APPLE_CHANGES
     void unscheduleRelayout();
-#endif
 
     void scheduleRepaint(int x, int y, int w, int h);
-
+    void unscheduleRepaint();
+    
     /**
      * Paints the HTML document to a QPainter.
      * The document will be scaled to match the width of
diff --git a/WebCore/khtml/rendering/render_root.cpp b/WebCore/khtml/rendering/render_root.cpp
index d75002d..be74fb0 100644
--- a/WebCore/khtml/rendering/render_root.cpp
+++ b/WebCore/khtml/rendering/render_root.cpp
@@ -254,9 +254,16 @@ void RenderRoot::repaintRectangle(int x, int y, int w, int h, bool immediate, bo
 void RenderRoot::repaint(bool immediate)
 {
     if (m_view && !m_printingMode) {
-        if (immediate)
+        if (immediate) {
+            m_view->resizeContents(docWidth(), docHeight());
+            m_view->unscheduleRepaint();
+            if (!layouted()) {
+                m_view->scheduleRelayout();
+                return;
+            }
             m_view->updateContents(m_view->contentsX(), m_view->contentsY(),
                                    m_view->visibleWidth(), m_view->visibleHeight());
+        }
         else
             m_view->scheduleRepaint(m_view->contentsX(), m_view->contentsY(),
                                     m_view->visibleWidth(), m_view->visibleHeight());

-- 
WebKit Debian packaging