[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 808edc9c3215974c7002b5330829752c736cc4a5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 18 07:55:46 2002 +0000

    	Don't use the immediate painting code for now.  Revert
    	to non-immediate code.  Using the non-immediate path I
    	have managed to fix all the regressions except for
    	mrskin losing updates in its marquee (this works only with
    	immediate painting) and the general scrollbar regression
    	(which I just don't understand).
    
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::close):
            * khtml/rendering/render_object.cpp:
            (RenderObject::setLayouted):
            * khtml/rendering/render_root.cpp:
            (RenderRoot::repaintRectangle):
            (RenderRoot::repaint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2727 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9f2d690..c7c8d35 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
 2002-11-17  David Hyatt  <hyatt at apple.com>
 
+	Don't use the immediate painting code for now.  Revert
+	to non-immediate code.  Using the non-immediate path I
+	have managed to fix all the regressions except for 
+	mrskin losing updates in its marquee (this works only with
+	immediate painting) and the general scrollbar regression 
+	(which I just don't understand).
+	
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        * khtml/rendering/render_root.cpp:
+        (RenderRoot::repaintRectangle):
+        (RenderRoot::repaint):
+
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
 	More refinements to immediate painting code.  Still doesn't
 	fix the scrollbar problem though. :(
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9f2d690..c7c8d35 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,22 @@
 2002-11-17  David Hyatt  <hyatt at apple.com>
 
+	Don't use the immediate painting code for now.  Revert
+	to non-immediate code.  Using the non-immediate path I
+	have managed to fix all the regressions except for 
+	mrskin losing updates in its marquee (this works only with
+	immediate painting) and the general scrollbar regression 
+	(which I just don't understand).
+	
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        * khtml/rendering/render_root.cpp:
+        (RenderRoot::repaintRectangle):
+        (RenderRoot::repaint):
+
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
 	More refinements to immediate painting code.  Still doesn't
 	fix the scrollbar problem though. :(
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9f2d690..c7c8d35 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,22 @@
 2002-11-17  David Hyatt  <hyatt at apple.com>
 
+	Don't use the immediate painting code for now.  Revert
+	to non-immediate code.  Using the non-immediate path I
+	have managed to fix all the regressions except for 
+	mrskin losing updates in its marquee (this works only with
+	immediate painting) and the general scrollbar regression 
+	(which I just don't understand).
+	
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        * khtml/rendering/render_root.cpp:
+        (RenderRoot::repaintRectangle):
+        (RenderRoot::repaint):
+
+2002-11-17  David Hyatt  <hyatt at apple.com>
+
 	More refinements to immediate painting code.  Still doesn't
 	fix the scrollbar problem though. :(
 	
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index e182bf0..84e1a45 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -324,13 +324,11 @@ void HTMLDocumentImpl::close()
     if (body() && doload) {
         updateRendering();
         
-        // Always do a full and immediate layout/repaint after loading.
+        // Always do a layout/repaint after loading.
         if (renderer()) {
-            if (!renderer()->layouted()) {
+            if (!renderer()->layouted())
                 renderer()->layout();
-                view()->unscheduleRelayout();
-            }
-            renderer()->repaint(true);
+            renderer()->repaint();
         }
     }
 }
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 39fdce7..7ed889f 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -256,8 +256,7 @@ void RenderObject::setLayouted(bool b)
             if (clippedObj) {
                 gClipObject = clippedObj;
                 root->layout();
-                clippedObj->repaintRectangle(0, 0, clippedObj->contentWidth(), 
-                                             clippedObj->contentHeight(), true);
+                clippedObj->repaint();
                 gClipObject = 0;
             }
             else
diff --git a/WebCore/khtml/rendering/render_root.cpp b/WebCore/khtml/rendering/render_root.cpp
index be74fb0..025f897 100644
--- a/WebCore/khtml/rendering/render_root.cpp
+++ b/WebCore/khtml/rendering/render_root.cpp
@@ -246,7 +246,7 @@ void RenderRoot::repaintRectangle(int x, int y, int w, int h, bool immediate, bo
 
     if (m_view && ur.intersects(vr))
         if (immediate)
-            m_view->updateContents(ur);
+            m_view->updateContents(ur, true);
         else
             m_view->scheduleRepaint(x, y, w, h);
 }
@@ -262,7 +262,7 @@ void RenderRoot::repaint(bool immediate)
                 return;
             }
             m_view->updateContents(m_view->contentsX(), m_view->contentsY(),
-                                   m_view->visibleWidth(), m_view->visibleHeight());
+                                   m_view->visibleWidth(), m_view->visibleHeight(), true);
         }
         else
             m_view->scheduleRepaint(m_view->contentsX(), m_view->contentsY(),

-- 
WebKit Debian packaging